Refactor viewport initialization logic out of WebViewImpl.

Source/WebKit/chromium/src/WebViewImpl.h

Index: Source/WebKit/chromium/src/WebViewImpl.h
diff --git a/Source/WebKit/chromium/src/WebViewImpl.h b/Source/WebKit/chromium/src/WebViewImpl.h
index 12f592213255f428f07332c20a77def3296cfca5..7c1ef56c5f0e5cacb32d0614f91685b4d251cc7a 100644
--- a/Source/WebKit/chromium/src/WebViewImpl.h
+++ b/Source/WebKit/chromium/src/WebViewImpl.h
@@ -41,6 +41,7 @@
 #include "PageOverlayList.h"
 #include "PageWidgetDelegate.h"
 #include "UserMediaClientImpl.h"
+#include "ViewportAttributesManager.h"
 #include "WebInputEvent.h"
 #include "WebNavigationPolicy.h"
 #include "WebView.h"
@@ -226,7 +227,6 @@ public:
                                    double maximumZoomLevel);
     virtual void setInitialPageScaleOverride(float);
     virtual float pageScaleFactor() const;
-    virtual bool isPageScaleFactorSet() const;
     virtual void setPageScaleFactorPreservingScrollOffset(float);
     virtual void setPageScaleFactor(float scaleFactor, const WebPoint& origin);
     virtual void setPageScaleFactorLimits(float minPageScale, float maxPageScale);
@@ -235,7 +235,7 @@ public:
     virtual void saveScrollAndScaleState();
     virtual void restoreScrollAndScaleState();
     virtual void resetScrollAndScaleState();
-    virtual void setIgnoreViewportTagMaximumScale(bool);
+    virtual void setIgnoreViewportTagScaleLimits(bool);
 
     virtual float deviceScaleFactor() const;
     virtual void setDeviceScaleFactor(float);
@@ -466,8 +466,7 @@ public:
         return m_emulatedTextZoomFactor;
     }
 
-    void setInitialPageScaleFactor(float initialPageScaleFactor) { m_initialPageScaleFactor = initialPageScaleFactor; }
-    bool ignoreViewportTagMaximumScale() const { return m_ignoreViewportTagMaximumScale; }
+    void updatePageDefinedViewportAttributes(const WebCore::ViewportArguments&);
 
     // Determines whether a page should e.g. be opened in a background tab.
     // Returns false if it has no opinion, in which case it doesn't set *policy.
@@ -594,9 +593,10 @@ public:
     WebSettingsImpl* settingsImpl();
 
 private:
-    void computePageScaleFactorLimits();
-    float clampPageScaleFactorToLimits(float scale);
-    WebCore::IntPoint clampOffsetAtScale(const WebCore::IntPoint& offset, float scale) const;
+    void refreshPageScaleFactorAfterLayout();
+    void overridePageScaleConstraints(WebCore::ViewportAttributes newConstraints);
+    float clampPageScaleFactorToLimits(float scale) const;

[kenneth.r.christiansen, 2013/05/13 11:00:18]

I dont know about the style today, but in WebKit you would leave out "scale"
after float

[aelias_OOO_until_Jul13, 2013/05/13 18:13:06]

Done.

+    WebCore::IntPoint clampOffsetAtScale(const WebCore::IntPoint& offset, float scale);
     WebCore::IntSize contentsSize() const;
 
     void resetSavedScrollAndScaleState();
@@ -726,15 +726,7 @@ private:
 
     double m_maximumZoomLevel;
 
-    // State related to the page scale
-    float m_pageDefinedMinimumPageScaleFactor;
-    float m_pageDefinedMaximumPageScaleFactor;
-    float m_minimumPageScaleFactor;
-    float m_maximumPageScaleFactor;
-    float m_initialPageScaleFactorOverride;
-    float m_initialPageScaleFactor;
-    bool m_ignoreViewportTagMaximumScale;
-    bool m_pageScaleFactorIsSet;
+    ViewportAttributesManager m_viewportAttributesManager;
 
     // Saved page scale state.
     float m_savedPageScaleFactor; // 0 means that no page scale factor is saved.