Changeset 87868 in webkit

Timestamp:

Jun 1, 2011 5:53:47 PM (13 years ago)

Author:

enne@google.com

Message:

2011-06-01 Adrienne Walker <​enne@google.com>

Reviewed by James Robinson.

[chromium] Fix syncing of removed mask and replica layers
​https://bugs.webkit.org/show_bug.cgi?id=61895

• platform/graphics/chromium/TreeSynchronizer.cpp: (WebCore::TreeSynchronizer::synchronizeTreeRecursive):

2011-06-01 Adrienne Walker <​enne@google.com>

Reviewed by James Robinson.

[chromium] Fix syncing of removed mask and replica layers
​https://bugs.webkit.org/show_bug.cgi?id=61895

• tests/TreeSynchronizerTest.cpp: (WebCore::TEST):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/chromium/TreeSynchronizer.cpp (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/tests/TreeSynchronizerTest.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-01  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        [chromium] Fix syncing of removed mask and replica layers
+        https://bugs.webkit.org/show_bug.cgi?id=61895
+
+        * platform/graphics/chromium/TreeSynchronizer.cpp:
+        (WebCore::TreeSynchronizer::synchronizeTreeRecursive):
+
 2011-06-01  Julien Chaffraix  <jchaffraix@codeaurora.org>
 

trunk/Source/WebCore/platform/graphics/chromium/TreeSynchronizer.cpp

@@ -67 +67 @@
     if (LayerChromium* maskLayer = layer->maskLayer())
         ccLayerImpl->setMaskLayer(synchronizeTreeRecursive(maskLayer, map));
+    else
+        ccLayerImpl->setMaskLayer(0);
 
     if (LayerChromium* replicaLayer = layer->replicaLayer())
         ccLayerImpl->setReplicaLayer(synchronizeTreeRecursive(replicaLayer, map));
+    else
+        ccLayerImpl->setReplicaLayer(0);
 
     layer->setCCLayerImpl(ccLayerImpl.get());
@@ -92 +96 @@
 
 } // namespace WebCore
-
-

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-06-01  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        [chromium] Fix syncing of removed mask and replica layers
+        https://bugs.webkit.org/show_bug.cgi?id=61895
+
+        * tests/TreeSynchronizerTest.cpp:
+        (WebCore::TEST):
+
 2011-06-01  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/chromium/tests/TreeSynchronizerTest.cpp

@@ -283 +283 @@
 
     expectTreesAreIdentical(layerTreeRoot.get(), ccLayerTreeRoot.get());
+
+    // Remove the mask layer.
+    layerTreeRoot->children()[0]->setMaskLayer(0);
+    ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), ccLayerTreeRoot.get());
+    expectTreesAreIdentical(layerTreeRoot.get(), ccLayerTreeRoot.get());
+
+    // Remove the replica layer.
+    layerTreeRoot->children()[1]->setReplicaLayer(0);
+    ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), ccLayerTreeRoot.get());
+    expectTreesAreIdentical(layerTreeRoot.get(), ccLayerTreeRoot.get());
+
+    // Remove the replica mask.
+    replicaLayerWithMask->setMaskLayer(0);
+    ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), ccLayerTreeRoot.get());
+    expectTreesAreIdentical(layerTreeRoot.get(), ccLayerTreeRoot.get());
 }
 
 
 } // namespace
-