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

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

Issue 139923006: [Cleanup] Follow Up of Pinch/Zoom Infrastucture & Plumbing CL (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: nit work. Created 6 years, 11 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 | « no previous file | Source/web/PinchViewports.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/scrolling/ScrollingCoordinator.cpp
diff --git a/Source/core/page/scrolling/ScrollingCoordinator.cpp b/Source/core/page/scrolling/ScrollingCoordinator.cpp
index bfb1ae1d44a1dd29fb94b0e039351aa346de4715..3e46289c8d3bb72c81d0d0482e02583064d7b803 100644
--- a/Source/core/page/scrolling/ScrollingCoordinator.cpp
+++ b/Source/core/page/scrolling/ScrollingCoordinator.cpp
@@ -358,12 +358,8 @@ bool ScrollingCoordinator::scrollableAreaScrollLayerDidChange(ScrollableArea* sc
WebLayer* webLayer = scrollingWebLayerForScrollableArea(scrollableArea);
WebLayer* containerLayer = containerWebLayerForScrollableArea(scrollableArea);
if (webLayer) {
- // TODO(wjmaclean) Remove the next line once https://codereview.chromium.org/23983047 lands.
- webLayer->setScrollable(true);
webLayer->setScrollClipLayer(containerLayer);
webLayer->setScrollPosition(IntPoint(scrollableArea->scrollPosition() - scrollableArea->minimumScrollPosition()));
- // TODO(wjmaclean) Remove the next line once https://codereview.chromium.org/23983047 lands.
- webLayer->setMaxScrollPosition(IntSize(scrollableArea->scrollSize(HorizontalScrollbar), scrollableArea->scrollSize(VerticalScrollbar)));
webLayer->setBounds(scrollableArea->contentsSize());
bool canScrollX = scrollableArea->userInputScrollable(HorizontalScrollbar);
bool canScrollY = scrollableArea->userInputScrollable(VerticalScrollbar);
« no previous file with comments | « no previous file | Source/web/PinchViewports.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698