Title: [87868] trunk/Source
- Revision
- 87868
- Author
- [email protected]
- Date
- 2011-06-01 17:53:47 -0700 (Wed, 01 Jun 2011)
Log Message
2011-06-01 Adrienne Walker <[email protected]>
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 <[email protected]>
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (87867 => 87868)
--- trunk/Source/WebCore/ChangeLog 2011-06-02 00:53:01 UTC (rev 87867)
+++ trunk/Source/WebCore/ChangeLog 2011-06-02 00:53:47 UTC (rev 87868)
@@ -1,3 +1,13 @@
+2011-06-01 Adrienne Walker <[email protected]>
+
+ 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 <[email protected]>
Reviewed by Simon Fraser.
Modified: trunk/Source/WebCore/platform/graphics/chromium/TreeSynchronizer.cpp (87867 => 87868)
--- trunk/Source/WebCore/platform/graphics/chromium/TreeSynchronizer.cpp 2011-06-02 00:53:01 UTC (rev 87867)
+++ trunk/Source/WebCore/platform/graphics/chromium/TreeSynchronizer.cpp 2011-06-02 00:53:47 UTC (rev 87868)
@@ -66,9 +66,13 @@
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());
@@ -91,5 +95,3 @@
}
} // namespace WebCore
-
-
Modified: trunk/Source/WebKit/chromium/ChangeLog (87867 => 87868)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-02 00:53:01 UTC (rev 87867)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-02 00:53:47 UTC (rev 87868)
@@ -1,3 +1,13 @@
+2011-06-01 Adrienne Walker <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, rolling out r87788.
Modified: trunk/Source/WebKit/chromium/tests/TreeSynchronizerTest.cpp (87867 => 87868)
--- trunk/Source/WebKit/chromium/tests/TreeSynchronizerTest.cpp 2011-06-02 00:53:01 UTC (rev 87867)
+++ trunk/Source/WebKit/chromium/tests/TreeSynchronizerTest.cpp 2011-06-02 00:53:47 UTC (rev 87868)
@@ -282,8 +282,22 @@
RefPtr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), 0);
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
-
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
