[Pinch-to-zoom] Moved scale factor into PinchViewport

Source/web/WebViewImpl.h

Index: Source/web/WebViewImpl.h
diff --git a/Source/web/WebViewImpl.h b/Source/web/WebViewImpl.h
index 41040d5a9004aa9424d4c9ce01f2c34cface6143..81f3a8125e2a5f9df8373ab72db7567f8c47f61a 100644
--- a/Source/web/WebViewImpl.h
+++ b/Source/web/WebViewImpl.h
@@ -179,9 +179,11 @@ public:
     virtual void setInitialPageScaleOverride(float) OVERRIDE;
     virtual bool zoomToMultipleTargetsRect(const WebRect&) OVERRIDE;
     virtual float pageScaleFactor() const OVERRIDE;
-    virtual void setPageScaleFactorPreservingScrollOffset(float) OVERRIDE;
-    virtual void setPageScaleFactor(float scaleFactor, const WebPoint& origin) OVERRIDE;
     virtual void setPageScaleFactorLimits(float minPageScale, float maxPageScale) OVERRIDE;
+    virtual void setMainFrameScrollOffset(const WebPoint&) OVERRIDE;
+    virtual void setPageScaleFactor(float) OVERRIDE;
+    virtual void setPinchViewportOffset(const WebFloatPoint&) OVERRIDE;
+    virtual WebFloatPoint pinchViewportOffset() const OVERRIDE;
     virtual float minimumPageScaleFactor() const OVERRIDE;
     virtual float maximumPageScaleFactor() const OVERRIDE;
     virtual void saveScrollAndScaleState() OVERRIDE;
@@ -485,6 +487,12 @@ public:
     WebLayerTreeView* layerTreeView() const { return m_layerTreeView; }
 
 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;
+
+    bool pinchVirtualViewportEnabled() const;
+
     float legibleScale() const;
     void refreshPageScaleFactorAfterLayout();
     void resumeTreeViewCommits();