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

Unified Diff: Source/core/page/scrolling/ScrollingCoordinator.cpp

Issue 1318603005: Revert of Replace pinch scrollbars with regular scrollbars. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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/page/scrolling/ScrollingCoordinator.cpp
diff --git a/Source/core/page/scrolling/ScrollingCoordinator.cpp b/Source/core/page/scrolling/ScrollingCoordinator.cpp
index 66097e4e3d4a90296772aa6bc27d82b568777cb2..b3453c907d0d73caf70d7984fbdca9b06c3adb8a 100644
--- a/Source/core/page/scrolling/ScrollingCoordinator.cpp
+++ b/Source/core/page/scrolling/ScrollingCoordinator.cpp
@@ -381,8 +381,8 @@
}
WebLayer* scrollLayer = toWebLayer(scrollableArea->layerForScrolling());
- WebLayer* scrollbarContainerLayer = toWebLayer(scrollableArea->layerForScrollbarContainer());
- setupScrollbarLayer(scrollbarGraphicsLayer, scrollbarLayer, scrollLayer, scrollbarContainerLayer);
+ WebLayer* containerLayer = toWebLayer(scrollableArea->layerForContainer());
+ setupScrollbarLayer(scrollbarGraphicsLayer, scrollbarLayer, scrollLayer, containerLayer);
// Root layer non-overlay scrollbars should be marked opaque to disable
// blending.
@@ -403,7 +403,6 @@
WebLayer* webLayer = toWebLayer(scrollableArea->layerForScrolling());
WebLayer* containerLayer = toWebLayer(scrollableArea->layerForContainer());
- WebLayer* scrollbarContainerLayer = toWebLayer(scrollableArea->layerForScrollbarContainer());
if (webLayer) {
webLayer->setScrollClipLayer(containerLayer);
// Non-layered Viewport constrained objects, e.g. fixed position elements, are
@@ -432,13 +431,12 @@
if (WebScrollbarLayer* scrollbarLayer = getWebScrollbarLayer(scrollableArea, HorizontalScrollbar)) {
GraphicsLayer* horizontalScrollbarLayer = scrollableArea->layerForHorizontalScrollbar();
if (horizontalScrollbarLayer)
- setupScrollbarLayer(horizontalScrollbarLayer, scrollbarLayer, webLayer, scrollbarContainerLayer);
+ setupScrollbarLayer(horizontalScrollbarLayer, scrollbarLayer, webLayer, containerLayer);
}
if (WebScrollbarLayer* scrollbarLayer = getWebScrollbarLayer(scrollableArea, VerticalScrollbar)) {
GraphicsLayer* verticalScrollbarLayer = scrollableArea->layerForVerticalScrollbar();
-
if (verticalScrollbarLayer)
- setupScrollbarLayer(verticalScrollbarLayer, scrollbarLayer, webLayer, scrollbarContainerLayer);
+ setupScrollbarLayer(verticalScrollbarLayer, scrollbarLayer, webLayer, containerLayer);
}
// Update the viewport layer registration if the outer viewport may have changed.

Powered by Google App Engine
This is Rietveld 408576698