Moved main frame resize to happen outside refreshPageScaleFactor.

Source/web/PageScaleConstraintsSet.cpp

 /*
  * 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 36 matching lines @@
     , m_constraintsDirty(false)
 {
     m_finalConstraints = defaultConstraints();
 }
 
 PageScaleConstraints PageScaleConstraintsSet::defaultConstraints() const
 {
     return PageScaleConstraints(-1, defaultMinimumScale, defaultMaximumScale);
 }
 
-void PageScaleConstraintsSet::updatePageDefinedConstraints(const ViewportDescription& description, IntSize viewSize, Length legacyFallbackWidth)
+void PageScaleConstraintsSet::updatePageDefinedConstraints(const ViewportDescription& description, Length legacyFallbackWidth)
 {
-    m_pageDefinedConstraints = description.resolve(viewSize, legacyFallbackWidth);
+    m_pageDefinedConstraints = description.resolve(m_viewSize, legacyFallbackWidth);
 
     m_constraintsDirty = true;
 }
 
 void PageScaleConstraintsSet::setUserAgentConstraints(const PageScaleConstraints& userAgentConstraints)
 {
     m_userAgentConstraints = userAgentConstraints;
     m_constraintsDirty = true;
 }
 
 PageScaleConstraints PageScaleConstraintsSet::computeConstraintsStack() const
 {
     PageScaleConstraints constraints = defaultConstraints();
     constraints.overrideWith(m_pageDefinedConstraints);
     constraints.overrideWith(m_userAgentConstraints);
     return constraints;
 }
 
 void PageScaleConstraintsSet::computeFinalConstraints()
 {
     m_finalConstraints = computeConstraintsStack();
 
     m_constraintsDirty = false;
 }
 
-void PageScaleConstraintsSet::adjustFinalConstraintsToContentsSize(IntSize viewSize, IntSize contentsSize, int nonOverlayScrollbarWidth)
+void PageScaleConstraintsSet::adjustFinalConstraintsToContentsSize(IntSize contentsSize, int nonOverlayScrollbarWidth)
 {
-    m_finalConstraints.fitToContentsWidth(contentsSize.width(), viewSize.width() - nonOverlayScrollbarWidth);
+    m_finalConstraints.fitToContentsWidth(contentsSize.width(), m_viewSize.width() - nonOverlayScrollbarWidth);
 }
 
 void PageScaleConstraintsSet::setNeedsReset(bool needsReset)
 {
     m_needsReset = needsReset;
     if (needsReset)
         m_constraintsDirty = true;
 }
 
 void PageScaleConstraintsSet::didChangeContentsSize(IntSize contentsSize, float pageScaleFactor)
@@ skipping 30 matching lines @@
 static float getLayoutWidthForNonWideViewport(const FloatSize& deviceSize, float initialScale)
 {
     return initialScale == -1 ? deviceSize.width() : deviceSize.width() / initialScale;
 }
 
 static float computeHeightByAspectRatio(float width, const FloatSize& deviceSize)
 {
     return width * (deviceSize.height() / deviceSize.width());
 }
 
-IntSize PageScaleConstraintsSet::mainFrameSize(const IntSize& viewportSize, const IntSize& contentsSize) const
+void PageScaleConstraintsSet::didChangeViewSize(const IntSize& size)
+{
+    if (m_viewSize == size)
+        return;
+
+    m_viewSize = size;
+    m_constraintsDirty = true;
+}
+
+IntSize PageScaleConstraintsSet::mainFrameSize(const IntSize& contentsSize) const
 {
     // If there's no explicit minimum scale factor set, size the frame so that its width == content width
     // so there's no horizontal scrolling at the minimum scale.
     if (m_pageDefinedConstraints.minimumScale < finalConstraints().minimumScale
         && m_userAgentConstraints.minimumScale < finalConstraints().minimumScale
         && contentsSize.width()
-        && viewportSize.width())
-        return IntSize(contentsSize.width(), computeHeightByAspectRatio(contentsSize.width(), viewportSize));
+        && m_viewSize.width())
+        return IntSize(contentsSize.width(), computeHeightByAspectRatio(contentsSize.width(), m_viewSize));
 
     // If there is a minimum scale (or there's no content size yet), the frame size should match the viewport
     // size at minimum scale, since the viewport must always be contained by the frame.
-    IntSize frameSize(viewportSize);
+    IntSize frameSize(m_viewSize);
     frameSize.scale(1 / finalConstraints().minimumScale);
     return frameSize;
 }
 
-void PageScaleConstraintsSet::adjustForAndroidWebViewQuirks(const ViewportDescription& description, IntSize viewSize, int layoutFallbackWidth, float deviceScaleFactor, bool supportTargetDensityDPI, bool wideViewportQuirkEnabled, bool useWideViewport, bool loadWithOverviewMode, bool nonUserScalableQuirkEnabled)
+void PageScaleConstraintsSet::adjustForAndroidWebViewQuirks(const ViewportDescription& description, int layoutFallbackWidth, float deviceScaleFactor, bool supportTargetDensityDPI, bool wideViewportQuirkEnabled, bool useWideViewport, bool loadWithOverviewMode, bool nonUserScalableQuirkEnabled)
 {
     if (!supportTargetDensityDPI && !wideViewportQuirkEnabled && loadWithOverviewMode && !nonUserScalableQuirkEnabled)
         return;
 
     const float oldInitialScale = m_pageDefinedConstraints.initialScale;
     if (!loadWithOverviewMode) {
         bool resetInitialScale = false;
         if (description.zoom == -1) {
             if (description.maxWidth.isAuto() || description.maxWidth.type() == ExtendToZoom)
                 resetInitialScale = true;
@@ skipping 18 matching lines @@
             m_pageDefinedConstraints.maximumScale *= targetDensityDPIFactor;
         if (wideViewportQuirkEnabled && (!useWideViewport || description.maxWidth.type() == DeviceWidth)) {
             adjustedLayoutSizeWidth /= targetDensityDPIFactor;
             adjustedLayoutSizeHeight /= targetDensityDPIFactor;
         }
     }
 
     if (wideViewportQuirkEnabled) {
         if (useWideViewport && (description.maxWidth.isAuto() || description.maxWidth.type() == ExtendToZoom) && description.zoom != 1.0f) {
             adjustedLayoutSizeWidth = layoutFallbackWidth;
-            adjustedLayoutSizeHeight = computeHeightByAspectRatio(adjustedLayoutSizeWidth, viewSize);
+            adjustedLayoutSizeHeight = computeHeightByAspectRatio(adjustedLayoutSizeWidth, m_viewSize);
         } else if (!useWideViewport) {
             const float nonWideScale = description.zoom < 1 && description.maxWidth.type() != DeviceWidth && description.maxWidth.type() != DeviceHeight ? -1 : oldInitialScale;
-            adjustedLayoutSizeWidth = getLayoutWidthForNonWideViewport(viewSize, nonWideScale) / targetDensityDPIFactor;
+            adjustedLayoutSizeWidth = getLayoutWidthForNonWideViewport(m_viewSize, nonWideScale) / targetDensityDPIFactor;
             float newInitialScale = targetDensityDPIFactor;
             if (m_userAgentConstraints.initialScale != -1 && (description.maxWidth.type() == DeviceWidth || ((description.maxWidth.isAuto() || description.maxWidth.type() == ExtendToZoom) && description.zoom == -1))) {
                 adjustedLayoutSizeWidth /= m_userAgentConstraints.initialScale;
                 newInitialScale = m_userAgentConstraints.initialScale;
             }
-            adjustedLayoutSizeHeight = computeHeightByAspectRatio(adjustedLayoutSizeWidth, viewSize);
+            adjustedLayoutSizeHeight = computeHeightByAspectRatio(adjustedLayoutSizeWidth, m_viewSize);
             if (description.zoom < 1) {
                 m_pageDefinedConstraints.initialScale = newInitialScale;
                 if (m_pageDefinedConstraints.minimumScale != -1)
                     m_pageDefinedConstraints.minimumScale = std::min<float>(m_pageDefinedConstraints.minimumScale, m_pageDefinedConstraints.initialScale);
                 if (m_pageDefinedConstraints.maximumScale != -1)
                     m_pageDefinedConstraints.maximumScale = std::max<float>(m_pageDefinedConstraints.maximumScale, m_pageDefinedConstraints.initialScale);
             }
         }
     }
 
     if (nonUserScalableQuirkEnabled && !description.userZoom) {
         m_pageDefinedConstraints.initialScale = targetDensityDPIFactor;
         m_pageDefinedConstraints.minimumScale = m_pageDefinedConstraints.initialScale;
         m_pageDefinedConstraints.maximumScale = m_pageDefinedConstraints.initialScale;
         if (description.maxWidth.isAuto() || description.maxWidth.type() == ExtendToZoom || description.maxWidth.type() == DeviceWidth) {
-            adjustedLayoutSizeWidth = viewSize.width() / targetDensityDPIFactor;
-            adjustedLayoutSizeHeight = computeHeightByAspectRatio(adjustedLayoutSizeWidth, viewSize);
+            adjustedLayoutSizeWidth = m_viewSize.width() / targetDensityDPIFactor;
+            adjustedLayoutSizeHeight = computeHeightByAspectRatio(adjustedLayoutSizeWidth, m_viewSize);
         }
     }
 
     m_pageDefinedConstraints.layoutSize.setWidth(adjustedLayoutSizeWidth);
     m_pageDefinedConstraints.layoutSize.setHeight(adjustedLayoutSizeHeight);
 }
 
 } // namespace WebCore