Replace loadWithOverviewMode settings with calls to shrinksViewportContentToFit

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 143 matching lines @@
         && 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(m_viewSize);
     frameSize.scale(1 / finalConstraints().minimumScale);
     return frameSize;
 }
 
-void PageScaleConstraintsSet::adjustForAndroidWebViewQuirks(const ViewportDescription& description, 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 shrinksViewportContentToFit, bool nonUserScalableQuirkEnabled)
 {
-    if (!supportTargetDensityDPI && !wideViewportQuirkEnabled && loadWithOverviewMode && !nonUserScalableQuirkEnabled)
+    if (!supportTargetDensityDPI && !wideViewportQuirkEnabled && shrinksViewportContentToFit && !nonUserScalableQuirkEnabled)
         return;
 
     const float oldInitialScale = m_pageDefinedConstraints.initialScale;
-    if (!loadWithOverviewMode) {
+    if (!shrinksViewportContentToFit) {
         bool resetInitialScale = false;
         if (description.zoom == -1) {
             if (description.maxWidth.isAuto() || description.maxWidth.type() == ExtendToZoom)
                 resetInitialScale = true;
             if (useWideViewport || description.maxWidth.type() == DeviceWidth)
                 resetInitialScale = true;
         }
         if (resetInitialScale)
             m_pageDefinedConstraints.initialScale = 1.0f;
     }
@@ skipping 47 matching lines @@
             adjustedLayoutSizeWidth = m_viewSize.width() / targetDensityDPIFactor;
             adjustedLayoutSizeHeight = computeHeightByAspectRatio(adjustedLayoutSizeWidth, m_viewSize);
         }
     }
 
     m_pageDefinedConstraints.layoutSize.setWidth(adjustedLayoutSizeWidth);
     m_pageDefinedConstraints.layoutSize.setHeight(adjustedLayoutSizeHeight);
 }
 
 } // namespace WebCore