Title: [114856] branches/chromium/1084/Source/WebCore/platform/graphics/GraphicsLayer.cpp
- Revision
- 114856
- Author
- [email protected]
- Date
- 2012-04-21 17:18:34 -0700 (Sat, 21 Apr 2012)
Log Message
Merge 112939
BUG=121524
Review URL: https://chromiumcodereview.appspot.com/10169026
Modified Paths
Diff
Modified: branches/chromium/1084/Source/WebCore/platform/graphics/GraphicsLayer.cpp (114855 => 114856)
--- branches/chromium/1084/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2012-04-22 00:18:23 UTC (rev 114855)
+++ branches/chromium/1084/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2012-04-22 00:18:34 UTC (rev 114856)
@@ -99,6 +99,10 @@
if (m_client)
m_client->verifyNotPainting();
#endif
+
+ if (m_replicatedLayer)
+ m_replicatedLayer->setReplicatedByLayer(0);
+
removeAllChildren();
removeFromParent();
}
@@ -259,6 +263,12 @@
void GraphicsLayer::setReplicatedByLayer(GraphicsLayer* layer)
{
+ if (m_replicaLayer == layer)
+ return;
+
+ if (m_replicaLayer)
+ m_replicaLayer->setReplicatedLayer(0);
+
if (layer)
layer->setReplicatedLayer(this);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
