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

Unified Diff: Source/platform/graphics/GraphicsLayer.cpp

Issue 584833003: Made double-tap zoom work in pinch virtual viewport mode. (Blink-side) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: TODO->FIXME Created 6 years, 3 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/platform/graphics/GraphicsLayer.cpp
diff --git a/Source/platform/graphics/GraphicsLayer.cpp b/Source/platform/graphics/GraphicsLayer.cpp
index d4cfec068531bfc6af789a6234b2ea02cd898210..f7041b472498de111e7915834bf49282a3bba24d 100644
--- a/Source/platform/graphics/GraphicsLayer.cpp
+++ b/Source/platform/graphics/GraphicsLayer.cpp
@@ -1017,18 +1017,16 @@ void GraphicsLayer::removeLinkHighlight(LinkHighlightClient* linkHighlight)
updateChildList();
}
-void GraphicsLayer::setScrollableArea(ScrollableArea* scrollableArea, bool isMainFrame)
+void GraphicsLayer::setScrollableArea(ScrollableArea* scrollableArea, bool isViewport)
{
if (m_scrollableArea == scrollableArea)
return;
m_scrollableArea = scrollableArea;
- // Main frame scrolling may involve pinch zoom and gets routed through
+ // Viewport scrolling may involve pinch zoom and gets routed through
// WebViewImpl explicitly rather than via GraphicsLayer::didScroll.
- // TODO(bokan): With pinch virtual viewport the special case will no
- // longer be needed, remove once old-style pinch is gone.
- if (isMainFrame)
+ if (isViewport)
m_layer->layer()->setScrollClient(0);
else
m_layer->layer()->setScrollClient(this);

Powered by Google App Engine
This is Rietveld 408576698