Moved main frame resize to happen outside refreshPageScaleFactor.

Source/web/PageScaleConstraintsSet.h

Index: Source/web/PageScaleConstraintsSet.h
diff --git a/Source/web/PageScaleConstraintsSet.h b/Source/web/PageScaleConstraintsSet.h
index 17b0207546d8ab4ddad63c75ed002511144a7c78..fa143f9a3d7f7741527cd8824ec09c65c3959260 100644
--- a/Source/web/PageScaleConstraintsSet.h
+++ b/Source/web/PageScaleConstraintsSet.h
@@ -49,8 +49,8 @@ public:
     // 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.
@@ -61,7 +61,7 @@ public:
     // 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);
 
@@ -73,7 +73,9 @@ public:
     // 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;
@@ -83,6 +85,7 @@ private:
     WebCore::PageScaleConstraints m_finalConstraints;
 
     int m_lastContentsWidth;
+    WebCore::IntSize m_viewSize;
 
     bool m_needsReset;
     bool m_constraintsDirty;