Merge 112939

Source/WebCore/platform/graphics/GraphicsLayer.cpp

Index: Source/WebCore/platform/graphics/GraphicsLayer.cpp
===================================================================
--- Source/WebCore/platform/graphics/GraphicsLayer.cpp	(revision 114854)
+++ Source/WebCore/platform/graphics/GraphicsLayer.cpp	(working copy)
@@ -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);