Merge 112939

Source/WebCore/platform/graphics/GraphicsLayer.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 81 matching lines @@
         m_client->verifyNotPainting();
 #endif
 }
 
 GraphicsLayer::~GraphicsLayer()
 {
 #ifndef NDEBUG
     if (m_client)
         m_client->verifyNotPainting();
 #endif
+
+    if (m_replicatedLayer)
+        m_replicatedLayer->setReplicatedByLayer(0);
+
     removeAllChildren();
     removeFromParent();
 }
 
 void GraphicsLayer::setParent(GraphicsLayer* layer)
 {
     ASSERT(!layer || !layer->hasAncestor(this));
     m_parent = layer;
 }
 
@@ skipping 140 matching lines @@
         m_replicaLayer->noteDeviceOrPageScaleFactorChangedIncludingDescendants();
 
     const Vector<GraphicsLayer*>& childLayers = children();
     size_t numChildren = childLayers.size();
     for (size_t i = 0; i < numChildren; ++i)
         childLayers[i]->noteDeviceOrPageScaleFactorChangedIncludingDescendants();
 }
 
 void GraphicsLayer::setReplicatedByLayer(GraphicsLayer* layer)
 {
+    if (m_replicaLayer == layer)
+        return;
+
+    if (m_replicaLayer)
+        m_replicaLayer->setReplicatedLayer(0);
+
     if (layer)
         layer->setReplicatedLayer(this);
 
     m_replicaLayer = layer;
 }
 
 void GraphicsLayer::setOffsetFromRenderer(const IntSize& offset)
 {
     if (offset == m_offsetFromRenderer)
         return;
@@ skipping 373 matching lines @@
 {
     if (!layer)
         return;
 
     WTF::String output = layer->layerTreeAsText(LayerTreeAsTextDebug);
     fprintf(stderr, "%s\n", output.utf8().data());
 }
 #endif
 
 #endif // USE(ACCELERATED_COMPOSITING)