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

Unified Diff: sky/engine/core/page/scrolling/ScrollingCoordinator.cpp

Issue 686653002: Remove a bunch of fixed position dead code. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « sky/engine/core/page/scrolling/ScrollingCoordinator.h ('k') | sky/engine/core/rendering/RenderBlock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/page/scrolling/ScrollingCoordinator.cpp
diff --git a/sky/engine/core/page/scrolling/ScrollingCoordinator.cpp b/sky/engine/core/page/scrolling/ScrollingCoordinator.cpp
index f94cf7b04dca3fe1535f9a7db46706b21579d686..868e78a0ba16c639802424ecb7a6a276fc178681 100644
--- a/sky/engine/core/page/scrolling/ScrollingCoordinator.cpp
+++ b/sky/engine/core/page/scrolling/ScrollingCoordinator.cpp
@@ -54,7 +54,6 @@
#include "platform/scroll/Scrollbar.h"
#include "public/platform/Platform.h"
#include "public/platform/WebCompositorSupport.h"
-#include "public/platform/WebLayerPositionConstraint.h"
#include "public/platform/WebScrollbarLayer.h"
#include "public/platform/WebScrollbarThemeGeometry.h"
#include "public/platform/WebScrollbarThemePainter.h"
@@ -161,33 +160,6 @@ void ScrollingCoordinator::setLayerIsContainerForFixedPositionLayers(GraphicsLay
scrollableLayer->setIsContainerForFixedPositionLayers(enable);
}
-static void clearPositionConstraintExceptForLayer(GraphicsLayer* layer, GraphicsLayer* except)
-{
- if (layer && layer != except && toWebLayer(layer))
- toWebLayer(layer)->setPositionConstraint(WebLayerPositionConstraint());
-}
-
-static WebLayerPositionConstraint computePositionConstraint(const RenderLayer* layer)
-{
- // FIXME(sky): Remove
- return WebLayerPositionConstraint();
-}
-
-void ScrollingCoordinator::updateLayerPositionConstraint(RenderLayer* layer)
-{
- ASSERT(layer->hasCompositedLayerMapping());
- CompositedLayerMapping* compositedLayerMapping = layer->compositedLayerMapping();
- GraphicsLayer* mainLayer = compositedLayerMapping->childForSuperlayers();
-
- // Avoid unnecessary commits
- clearPositionConstraintExceptForLayer(compositedLayerMapping->squashingContainmentLayer(), mainLayer);
- clearPositionConstraintExceptForLayer(compositedLayerMapping->ancestorClippingLayer(), mainLayer);
- clearPositionConstraintExceptForLayer(compositedLayerMapping->mainGraphicsLayer(), mainLayer);
-
- if (WebLayer* scrollableLayer = toWebLayer(mainLayer))
- scrollableLayer->setPositionConstraint(computePositionConstraint(layer));
-}
-
void ScrollingCoordinator::willDestroyScrollableArea(ScrollableArea* scrollableArea)
{
removeWebScrollbarLayer(scrollableArea, HorizontalScrollbar);
« no previous file with comments | « sky/engine/core/page/scrolling/ScrollingCoordinator.h ('k') | sky/engine/core/rendering/RenderBlock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698