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

Unified Diff: sky/engine/core/rendering/compositing/GraphicsLayerTreeBuilder.cpp

Issue 721473002: Removed ScrollingCoordinator and a bunch of composited scrolling' (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: cr comments Created 6 years, 1 month 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: sky/engine/core/rendering/compositing/GraphicsLayerTreeBuilder.cpp
diff --git a/sky/engine/core/rendering/compositing/GraphicsLayerTreeBuilder.cpp b/sky/engine/core/rendering/compositing/GraphicsLayerTreeBuilder.cpp
index 8055be8e16dd8babcf8bdbdc00782e370f53ba2c..498ed9a17c1844ab2b7b63b373a04ba29ae3ba2d 100644
--- a/sky/engine/core/rendering/compositing/GraphicsLayerTreeBuilder.cpp
+++ b/sky/engine/core/rendering/compositing/GraphicsLayerTreeBuilder.cpp
@@ -83,21 +83,6 @@ void GraphicsLayerTreeBuilder::rebuild(RenderLayer& layer, AncestorInfo info)
if (hasCompositedLayerMapping) {
currentCompositedLayerMapping->parentForSublayers()->setChildren(layerChildren);
- // If the layer has a clipping layer the overflow controls layers will be siblings of the clipping layer.
- // Otherwise, the overflow control layers are normal children.
- // FIXME: Why isn't this handled in CLM updateInternalHierarchy?
- if (!currentCompositedLayerMapping->hasClippingLayer() && !currentCompositedLayerMapping->hasScrollingLayer()) {
- if (GraphicsLayer* overflowControlLayer = currentCompositedLayerMapping->layerForHorizontalScrollbar()) {
- overflowControlLayer->removeFromParent();
- currentCompositedLayerMapping->parentForSublayers()->addChild(overflowControlLayer);
- }
-
- if (GraphicsLayer* overflowControlLayer = currentCompositedLayerMapping->layerForVerticalScrollbar()) {
- overflowControlLayer->removeFromParent();
- currentCompositedLayerMapping->parentForSublayers()->addChild(overflowControlLayer);
- }
- }
-
info.childLayersOfEnclosingCompositedLayer->append(currentCompositedLayerMapping->childForSuperlayers());
}

Powered by Google App Engine
This is Rietveld 408576698