Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1064)

Unified Diff: Source/core/rendering/CompositedLayerMapping.cpp

Issue 131543013: Update scroll parent correctly for squashing layers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/CompositedLayerMapping.cpp
diff --git a/Source/core/rendering/CompositedLayerMapping.cpp b/Source/core/rendering/CompositedLayerMapping.cpp
index 87abdddafedbdc97184e9b9588f382c81c0bb2fd..f37a9e1acd132e6176b3304058ac5fa21b5cb0ff 100644
--- a/Source/core/rendering/CompositedLayerMapping.cpp
+++ b/Source/core/rendering/CompositedLayerMapping.cpp
@@ -861,6 +861,7 @@ void CompositedLayerMapping::updateGraphicsLayerGeometry()
updateRenderingContext();
updateShouldFlattenTransform();
updateChildrenTransform();
+ updateScrollParent(m_owningLayer->scrollParent());
registerScrollingLayers();
updateCompositingReasons();
@@ -1364,7 +1365,8 @@ void CompositedLayerMapping::updateScrollParent(RenderLayer* scrollParent)
{
if (ScrollingCoordinator* scrollingCoordinator = scrollingCoordinatorFromLayer(m_owningLayer)) {
- GraphicsLayer* topmostLayer = localRootForOwningLayer();
+ GraphicsLayer* topmostLayer = childForSuperlayers();
+ updateScrollParentForGraphicsLayer(m_squashingContainmentLayer.get(), topmostLayer, scrollParent, scrollingCoordinator);
updateScrollParentForGraphicsLayer(m_ancestorClippingLayer.get(), topmostLayer, scrollParent, scrollingCoordinator);
updateScrollParentForGraphicsLayer(m_graphicsLayer.get(), topmostLayer, scrollParent, scrollingCoordinator);
}
« no previous file with comments | « no previous file | Source/platform/graphics/CompositingReasons.h » ('j') | Source/platform/graphics/CompositingReasons.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698