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

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: 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/web/WebViewImpl.h
diff --git a/Source/web/WebViewImpl.h b/Source/web/WebViewImpl.h
index f1e59bfce3d78dca21909aad9b2f77a3ed9378b4..1db7de2748f9195f7a55cef1b7ec10e5b05470e9 100644
--- a/Source/web/WebViewImpl.h
+++ b/Source/web/WebViewImpl.h
@@ -112,10 +112,18 @@ 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,
float topControlsDelta) OVERRIDE;
+ virtual void applyViewportDeltas(
+ const WebSize& pinchViewportDelta,
+ const WebSize& mainFrameDelta,
+ float pageScaleDelta,
+ float topControlsDelta) OVERRIDE;
virtual void mouseCaptureLost() OVERRIDE;
virtual void setFocus(bool enable) OVERRIDE;
virtual bool setComposition(
@@ -483,6 +491,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.
@@ -500,6 +510,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);

Powered by Google App Engine
This is Rietveld 408576698