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

Source/web/WebViewImpl.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 161 matching lines @@
     virtual void zoomToFindInPageRect(const WebRect&) OVERRIDE;
     virtual void advanceFocus(bool reverse) OVERRIDE;
     virtual double zoomLevel() OVERRIDE;
     virtual double setZoomLevel(double) OVERRIDE;
     virtual void zoomLimitsChanged(double minimumZoomLevel, double maximumZoomLevel) OVERRIDE;
     virtual float textZoomFactor() OVERRIDE;
     virtual float setTextZoomFactor(float) OVERRIDE;
     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;
     virtual void restoreScrollAndScaleState() OVERRIDE;
     virtual void resetScrollAndScaleState() OVERRIDE;
     virtual void setIgnoreViewportTagScaleLimits(bool) OVERRIDE;
     virtual WebSize contentsPreferredMinimumSize() OVERRIDE;
 
     virtual float deviceScaleFactor() const OVERRIDE;
     virtual void setDeviceScaleFactor(float) OVERRIDE;
@@ skipping 283 matching lines @@
     WebRect computeBlockBounds(const WebRect&, bool ignoreClipping);
 
     WebCore::IntPoint clampOffsetAtScale(const WebCore::IntPoint& offset, float scale);
 
     // Exposed for tests.
     WebVector<WebCompositionUnderline> compositionUnderlines() const;
 
     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();
     void setUserAgentPageScaleConstraints(WebCore::PageScaleConstraints newConstraints);
     float clampPageScaleFactorToLimits(float) const;
     WebCore::IntSize contentsSize() const;
 
     void resetSavedScrollAndScaleState();
 
     void updateMainFrameScrollPosition(const WebCore::IntPoint& scrollPosition, bool programmaticScroll);
@@ skipping 223 matching lines @@
     float m_zoomFactorOverride;
 };
 
 // We have no ways to check if the specified WebView is an instance of
 // WebViewImpl because WebViewImpl is the only implementation of WebView.
 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
 
 } // namespace blink
 
 #endif