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

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: Fix assert 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
« no previous file with comments | « Source/platform/graphics/GraphicsLayer.h ('k') | Source/web/WebViewImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/graphics/GraphicsLayer.cpp
diff --git a/Source/platform/graphics/GraphicsLayer.cpp b/Source/platform/graphics/GraphicsLayer.cpp
index 92056e8f7e8b8a526afb9a804ae8911773cc6c76..9622137ecd47e70dba0ad33a3c79cd14a902dc5a 100644
--- a/Source/platform/graphics/GraphicsLayer.cpp
+++ b/Source/platform/graphics/GraphicsLayer.cpp
@@ -1025,18 +1025,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);
« no previous file with comments | « Source/platform/graphics/GraphicsLayer.h ('k') | Source/web/WebViewImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698