Changeset 87868 in webkit
- Timestamp:
- Jun 1, 2011 5:53:47 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r87867 r87868 1 2011-06-01 Adrienne Walker <enne@google.com> 2 3 Reviewed by James Robinson. 4 5 [chromium] Fix syncing of removed mask and replica layers 6 https://bugs.webkit.org/show_bug.cgi?id=61895 7 8 * platform/graphics/chromium/TreeSynchronizer.cpp: 9 (WebCore::TreeSynchronizer::synchronizeTreeRecursive): 10 1 11 2011-06-01 Julien Chaffraix <jchaffraix@codeaurora.org> 2 12 -
trunk/Source/WebCore/platform/graphics/chromium/TreeSynchronizer.cpp
r86652 r87868 67 67 if (LayerChromium* maskLayer = layer->maskLayer()) 68 68 ccLayerImpl->setMaskLayer(synchronizeTreeRecursive(maskLayer, map)); 69 else 70 ccLayerImpl->setMaskLayer(0); 69 71 70 72 if (LayerChromium* replicaLayer = layer->replicaLayer()) 71 73 ccLayerImpl->setReplicaLayer(synchronizeTreeRecursive(replicaLayer, map)); 74 else 75 ccLayerImpl->setReplicaLayer(0); 72 76 73 77 layer->setCCLayerImpl(ccLayerImpl.get()); … … 92 96 93 97 } // namespace WebCore 94 95 -
trunk/Source/WebKit/chromium/ChangeLog
r87799 r87868 1 2011-06-01 Adrienne Walker <enne@google.com> 2 3 Reviewed by James Robinson. 4 5 [chromium] Fix syncing of removed mask and replica layers 6 https://bugs.webkit.org/show_bug.cgi?id=61895 7 8 * tests/TreeSynchronizerTest.cpp: 9 (WebCore::TEST): 10 1 11 2011-06-01 Sheriff Bot <webkit.review.bot@gmail.com> 2 12 -
trunk/Source/WebKit/chromium/tests/TreeSynchronizerTest.cpp
r86652 r87868 283 283 284 284 expectTreesAreIdentical(layerTreeRoot.get(), ccLayerTreeRoot.get()); 285 286 // Remove the mask layer. 287 layerTreeRoot->children()[0]->setMaskLayer(0); 288 ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), ccLayerTreeRoot.get()); 289 expectTreesAreIdentical(layerTreeRoot.get(), ccLayerTreeRoot.get()); 290 291 // Remove the replica layer. 292 layerTreeRoot->children()[1]->setReplicaLayer(0); 293 ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), ccLayerTreeRoot.get()); 294 expectTreesAreIdentical(layerTreeRoot.get(), ccLayerTreeRoot.get()); 295 296 // Remove the replica mask. 297 replicaLayerWithMask->setMaskLayer(0); 298 ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), ccLayerTreeRoot.get()); 299 expectTreesAreIdentical(layerTreeRoot.get(), ccLayerTreeRoot.get()); 285 300 } 286 301 287 302 288 303 } // namespace 289
Note: See TracChangeset
for help on using the changeset viewer.