Moved main frame resize to happen outside refreshPageScaleFactor.

Source/web/PageScaleConstraintsSet.h

 /*
  * Copyright (C) 2013 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 31 matching lines @@
 // the meta viewport tag and other sources.
 class PageScaleConstraintsSet {
 public:
     PageScaleConstraintsSet();
 
     WebCore::PageScaleConstraints defaultConstraints() const;
 
     // Settings defined in the website's viewport tag, if viewport tag support
     // is enabled.
     const WebCore::PageScaleConstraints& pageDefinedConstraints() const { return m_pageDefinedConstraints; }
-    void updatePageDefinedConstraints(const WebCore::ViewportDescription&, WebCore::IntSize viewSize, WebCore::Length legacyFallbackWidth);
-    void adjustForAndroidWebViewQuirks(const WebCore::ViewportDescription&, WebCore::IntSize viewSize, int layoutFallbackWidth, float deviceScaleFactor, bool supportTargetDensityDPI, bool wideViewportQuirkEnabled, bool useWideViewport, bool loadWithOverviewMode, bool nonUserScalableQuirkEnabled);
+    void updatePageDefinedConstraints(const WebCore::ViewportDescription&, WebCore::Length legacyFallbackWidth);
+    void adjustForAndroidWebViewQuirks(const WebCore::ViewportDescription&, int layoutFallbackWidth, float deviceScaleFactor, bool supportTargetDensityDPI, bool wideViewportQuirkEnabled, bool useWideViewport, bool loadWithOverviewMode, bool nonUserScalableQuirkEnabled);
 
     // Constraints may also be set from Chromium -- this overrides any
     // page-defined values.
     const WebCore::PageScaleConstraints& userAgentConstraints() const { return m_userAgentConstraints; }
     void setUserAgentConstraints(const WebCore::PageScaleConstraints&);
 
     // Actual computed values, taking into account the above plus the current
     // viewport size and document width.
     const WebCore::PageScaleConstraints& finalConstraints() const { return m_finalConstraints; }
     void computeFinalConstraints();
-    void adjustFinalConstraintsToContentsSize(WebCore::IntSize viewSize, WebCore::IntSize contentsSize, int nonOverlayScrollbarWidth);
+    void adjustFinalConstraintsToContentsSize(WebCore::IntSize contentsSize, int nonOverlayScrollbarWidth);
 
     void didChangeContentsSize(WebCore::IntSize contentsSize, float pageScaleFactor);
 
     // This should be set to true on each page load to note that the page scale
     // factor needs to be reset to its initial value.
     void setNeedsReset(bool);
     bool needsReset() const { return m_needsReset; }
 
     // This is set when one of the inputs to finalConstraints changes.
     bool constraintsDirty() const { return m_constraintsDirty; }
 
-    WebCore::IntSize mainFrameSize(const WebCore::IntSize& viewportSize, const WebCore::IntSize& contentsSize) const;
+    void didChangeViewSize(const WebCore::IntSize&);
+
+    WebCore::IntSize mainFrameSize(const WebCore::IntSize& contentsSize) const;
 
 private:
     WebCore::PageScaleConstraints computeConstraintsStack() const;
 
     WebCore::PageScaleConstraints m_pageDefinedConstraints;
     WebCore::PageScaleConstraints m_userAgentConstraints;
     WebCore::PageScaleConstraints m_finalConstraints;
 
     int m_lastContentsWidth;
+    WebCore::IntSize m_viewSize;
 
     bool m_needsReset;
     bool m_constraintsDirty;
 };
 
 } // namespace WebCore
 
 #endif // PageScaleConstraintsSet_h