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

Unified Diff: Source/web/WebViewImpl.h

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.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewImpl.h
diff --git a/Source/web/WebViewImpl.h b/Source/web/WebViewImpl.h
index 9bd645bc390978e790c949b3a815ce030393379c..b9b7a03851d63e6cab7f115de14d808095991a63 100644
--- a/Source/web/WebViewImpl.h
+++ b/Source/web/WebViewImpl.h
@@ -115,6 +115,9 @@ public:
virtual bool handleInputEvent(const WebInputEvent&) OVERRIDE;
virtual void setCursorVisibilityState(bool isVisible) OVERRIDE;
virtual bool hasTouchEventHandlersAt(const WebPoint&) OVERRIDE;
+
+ // FIXME(bokan): Old pinch path only - This should be removed once old pinch
+ // is removed.
virtual void applyViewportDeltas(
const WebSize& scrollDelta,
float pageScaleDelta,
@@ -490,6 +493,8 @@ public:
// Returns the bounding box of the block type node touched by the WebRect.
WebRect computeBlockBounds(const WebRect&, bool ignoreClipping);
+ // FIXME(bokan): Replace with PinchViewport::clampDocumentOffsetAtScale once
+ // old-path is gone.
IntPoint clampOffsetAtScale(const IntPoint& offset, float scale);
// Exposed for tests.
@@ -510,6 +515,7 @@ private:
// TODO(bokan): Remains for legacy pinch. Remove once it's gone. Made private to
// prevent external usage
virtual void setPageScaleFactor(float scaleFactor, const WebPoint& origin) OVERRIDE;
+ void setPageScaleFactorAndLocation(float, const FloatPoint&);
void scrollAndRescaleViewports(float scaleFactor, const IntPoint& mainFrameOrigin, const FloatPoint& pinchViewportOrigin);
« no previous file with comments | « Source/platform/graphics/GraphicsLayer.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698