Refactor viewport initialization logic out of WebViewImpl.

Source/WebKit/chromium/src/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 23 matching lines @@
 #include "BackForwardClientImpl.h"
 #include "ChromeClientImpl.h"
 #include "ContextMenuClientImpl.h"
 #include "DragClientImpl.h"
 #include "EditorClientImpl.h"
 #include "InspectorClientImpl.h"
 #include "NotificationPresenterImpl.h"
 #include "PageOverlayList.h"
 #include "PageWidgetDelegate.h"
 #include "UserMediaClientImpl.h"
+#include "ViewportAttributesManager.h"
 #include "WebInputEvent.h"
 #include "WebNavigationPolicy.h"
 #include "WebView.h"
 #include "WebViewBenchmarkSupportImpl.h"
 #include "core/page/PagePopupDriver.h"
 #include "core/platform/graphics/FloatSize.h"
 #include "core/platform/graphics/GraphicsContext3D.h"
 #include "core/platform/graphics/GraphicsLayer.h"
 #include "core/platform/graphics/IntPoint.h"
 #include "core/platform/graphics/IntRect.h"
@@ skipping 165 matching lines @@
     virtual void scrollFocusedNodeIntoView();
     virtual void scrollFocusedNodeIntoRect(const WebRect&);
     virtual void zoomToFindInPageRect(const WebRect&);
     virtual void advanceFocus(bool reverse);
     virtual double zoomLevel();
     virtual double setZoomLevel(bool textOnly, double zoomLevel);
     virtual void zoomLimitsChanged(double minimumZoomLevel,
                                    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);
     virtual float minimumPageScaleFactor() const;
     virtual float maximumPageScaleFactor() const;
     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);
     virtual bool isFixedLayoutModeEnabled() const;
     virtual void enableFixedLayoutMode(bool enable);
     virtual WebSize fixedLayoutSize() const;
     virtual void setFixedLayoutSize(const WebSize&);
     virtual void enableAutoResizeMode(
         const WebSize& minSize,
         const WebSize& maxSize);
@@ skipping 210 matching lines @@
     // (may not be 1 in the device metrics emulation mode).
     void setEmulatedTextZoomFactor(float);
 
     // Returns the emulated text zoom factor
     // (which may not be 1 in the device metrics emulation mode).
     float emulatedTextZoomFactor() const
     {
         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.
     static bool navigationPolicyFromMouseEvent(
         unsigned short button,
         bool ctrl,
         bool shift,
         bool alt,
         bool meta,
         WebNavigationPolicy*);
@@ skipping 106 matching lines @@
     // Heuristic-based function for determining if we should disable workarounds
     // for viewing websites that are not optimized for mobile devices.
     bool shouldDisableDesktopWorkarounds();
 
     // Exposed for tests.
     LinkHighlight* linkHighlight() { return m_linkHighlight.get(); }
 
     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();
 
     void updateMainFrameScrollPosition(const WebCore::IntPoint& scrollPosition, bool programmaticScroll);
 
     friend class WebView;  // So WebView::Create can call our constructor
     friend class WTF::RefCounted<WebViewImpl>;
     friend void setCurrentInputEventForTest(const WebInputEvent*);
 
@@ skipping 109 matching lines @@
     WebPoint m_lastMouseDownPoint;
 
     // Keeps track of the current zoom level. 0 means no zoom, positive numbers
     // mean zoom in, negative numbers mean zoom out.
     double m_zoomLevel;
 
     double m_minimumZoomLevel;
 
     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.
     WebCore::IntSize m_savedScrollOffset;
 
     // The scale moved to by the latest double tap zoom, if any.
     float m_doubleTapZoomPageScaleFactor;
     // Have we sent a double-tap zoom and not yet heard back the scale?
     bool m_doubleTapZoomPending;
 
@@ skipping 122 matching lines @@
 
     bool m_showFPSCounter;
     bool m_showPaintRects;
     bool m_showDebugBorders;
     bool m_continuousPaintingEnabled;
 };
 
 } // namespace WebKit
 
 #endif