Revert of Don't change layout size due to top control show/hide

third_party/WebKit/Source/core/frame/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 39 matching lines @@
     m_constraintsDirty = true;
 }
 
 const PageScaleConstraints& PageScaleConstraintsSet::defaultConstraints() const
 {
     return m_defaultConstraints;
 }
 
 void PageScaleConstraintsSet::updatePageDefinedConstraints(const ViewportDescription& description, Length legacyFallbackWidth)
 {
-    m_pageDefinedConstraints = description.resolve(FloatSize(m_icbSize), legacyFallbackWidth);
+    m_pageDefinedConstraints = description.resolve(FloatSize(m_viewSize), legacyFallbackWidth);
 
     m_constraintsDirty = true;
 }
 
 void PageScaleConstraintsSet::clearPageDefinedConstraints()
 {
     m_pageDefinedConstraints = PageScaleConstraints();
     m_constraintsDirty = true;
 }
 
@@ skipping 21 matching lines @@
 void PageScaleConstraintsSet::computeFinalConstraints()
 {
     m_finalConstraints = computeConstraintsStack();
 
     m_constraintsDirty = false;
 }
 
 void PageScaleConstraintsSet::adjustFinalConstraintsToContentsSize(IntSize contentsSize, int nonOverlayScrollbarWidth, bool shrinksViewportContentToFit)
 {
     if (shrinksViewportContentToFit)
-        m_finalConstraints.fitToContentsWidth(contentsSize.width(), m_icbSize.width() - nonOverlayScrollbarWidth);
+        m_finalConstraints.fitToContentsWidth(contentsSize.width(), m_viewSize.width() - nonOverlayScrollbarWidth);
 
     m_finalConstraints.resolveAutoInitialScale();
 }
 
 void PageScaleConstraintsSet::setNeedsReset(bool needsReset)
 {
     m_needsReset = needsReset;
     if (needsReset)
         m_constraintsDirty = true;
 }
@@ skipping 32 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());
 }
 
-void PageScaleConstraintsSet::didChangeInitialContainingBlockSize(const IntSize& size)
+void PageScaleConstraintsSet::didChangeViewSize(const IntSize& size)
 {
-    if (m_icbSize == size)
+    if (m_viewSize == size)
         return;
 
-    m_icbSize = size;
+    m_viewSize = size;
     m_constraintsDirty = true;
 }
 
+IntSize PageScaleConstraintsSet::mainFrameSize() const
+{
+    // The frame size should match the viewport size at minimum scale, since the
+    // viewport must always be contained by the frame.
+    FloatSize frameSize(m_viewSize);
+    frameSize.scale(1 / finalConstraints().minimumScale);
+    return expandedIntSize(frameSize);
+}
+
 IntSize PageScaleConstraintsSet::layoutSize() const
 {
     return flooredIntSize(computeConstraintsStack().layoutSize);
 }
 
 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;
 
@@ skipping 25 matching lines @@
         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) {
             if (layoutFallbackWidth)
                 adjustedLayoutSizeWidth = layoutFallbackWidth;
-            adjustedLayoutSizeHeight = computeHeightByAspectRatio(adjustedLayoutSizeWidth, FloatSize(m_icbSize));
+            adjustedLayoutSizeHeight = computeHeightByAspectRatio(adjustedLayoutSizeWidth, FloatSize(m_viewSize));
         } else if (!useWideViewport) {
             const float nonWideScale = description.zoom < 1 && description.maxWidth.type() != DeviceWidth && description.maxWidth.type() != DeviceHeight ? -1 : oldInitialScale;
-            adjustedLayoutSizeWidth = getLayoutWidthForNonWideViewport(FloatSize(m_icbSize), nonWideScale) / targetDensityDPIFactor;
+            adjustedLayoutSizeWidth = getLayoutWidthForNonWideViewport(FloatSize(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, FloatSize(m_icbSize));
+            adjustedLayoutSizeHeight = computeHeightByAspectRatio(adjustedLayoutSizeWidth, FloatSize(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 = m_icbSize.width() / targetDensityDPIFactor;
-            adjustedLayoutSizeHeight = computeHeightByAspectRatio(adjustedLayoutSizeWidth, FloatSize(m_icbSize));
+            adjustedLayoutSizeWidth = m_viewSize.width() / targetDensityDPIFactor;
+            adjustedLayoutSizeHeight = computeHeightByAspectRatio(adjustedLayoutSizeWidth, FloatSize(m_viewSize));
         }
     }
 
     m_pageDefinedConstraints.layoutSize.setWidth(adjustedLayoutSizeWidth);
     m_pageDefinedConstraints.layoutSize.setHeight(adjustedLayoutSizeHeight);
 }
 
 } // namespace blink