Refactor viewport initialization logic out of WebViewImpl.

Source/core/dom/ViewportArguments.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2012 Intel Corporation. All rights reserved.
  *
@@ skipping 18 matching lines @@
 #include "core/dom/ViewportArguments.h"
 
 #include "core/dom/Document.h"
 #include "core/platform/graphics/IntSize.h"
 #include <wtf/text/WTFString.h>
 
 using namespace std;
 
 namespace WebCore {
 
-const float ViewportArguments::deprecatedTargetDPI = 160;
-
 static const float& compareIgnoringAuto(const float& value1, const float& value2, const float& (*compare) (const float&, const float&))
 {
     ASSERT(value1 != ViewportArguments::ValueAuto || value2 != ViewportArguments::ValueAuto);
 
     if (value1 == ViewportArguments::ValueAuto)
         return value2;
 
     if (value2 == ViewportArguments::ValueAuto)
         return value1;
 
@@ skipping 15 matching lines @@
 {
     ASSERT(value != ViewportArguments::ValueDeviceWidth);
     ASSERT(value != ViewportArguments::ValueDeviceHeight);
 
     // Limits as defined in the css-device-adapt spec.
     if (value != ViewportArguments::ValueAuto)
         return min(float(10), max(value, float(0.1)));
     return value;
 }
 
-ViewportAttributes ViewportArguments::resolve(const FloatSize& initialViewportSize, const FloatSize& deviceSize, int defaultWidth) const
+PageScaleConstraints ViewportArguments::resolve(const FloatSize& initialViewportSize, const FloatSize& deviceSize, int defaultWidth) const
 {
     float resultWidth = width;
     float resultMaxWidth = maxWidth;
     float resultMinWidth = minWidth;
     float resultHeight = height;
     float resultMinHeight = minHeight;
     float resultMaxHeight = maxHeight;
     float resultZoom = zoom;
     float resultMinZoom = minZoom;
     float resultMaxZoom = maxZoom;
@@ skipping 90 matching lines @@
     if (type != ViewportArguments::CSSDeviceAdaptation && type != ViewportArguments::Implicit) {
         // Clamp values to a valid range, but not for @viewport since is
         // not mandated by the specification.
         resultWidth = clampLengthValue(resultWidth);
         resultHeight = clampLengthValue(resultHeight);
         resultZoom = clampScaleValue(resultZoom);
         resultMinZoom = clampScaleValue(resultMinZoom);
         resultMaxZoom = clampScaleValue(resultMaxZoom);
     }
 
-    ViewportAttributes result;
-    result.orientation = orientation;
+    PageScaleConstraints result;
 
     // Resolve minimum-scale and maximum-scale values according to spec.
     if (resultMinZoom == ViewportArguments::ValueAuto)
         result.minimumScale = float(0.25);
     else
         result.minimumScale = resultMinZoom;
 
     if (resultMaxZoom == ViewportArguments::ValueAuto) {
         result.maximumScale = float(5.0);
         result.minimumScale = min(float(5.0), result.minimumScale);
@@ skipping 32 matching lines @@
 
     if (type == ViewportArguments::ViewportMeta) {
         // Extend width and height to fill the visual viewport for the resolved initial-scale.
         resultWidth = max<float>(resultWidth, initialViewportSize.width() / result.initialScale);
         resultHeight = max<float>(resultHeight, initialViewportSize.height() / result.initialScale);
     }
 
     result.layoutSize.setWidth(resultWidth);
     result.layoutSize.setHeight(resultHeight);
 
-    // FIXME: This might affect some ports, but is the right thing to do.
+    // If user-scalable = no, lock the min/max scale to the computed initial
+    // scale.
+    if (!resultUserZoom)
+        result.maximumScale = result.minimumScale = result.initialScale;
+
     // Only set initialScale to a value if it was explicitly set.
-    // if (resultZoom == ViewportArguments::ValueAuto)
-    //    result.initialScale = ViewportArguments::ValueAuto;
-
-    result.userScalable = resultUserZoom;
-    result.orientation = orientation;
+    if (resultZoom == ViewportArguments::ValueAuto)
+        result.initialScale = ViewportArguments::ValueAuto;
 
     return result;
 }
 
-static FloatSize convertToUserSpace(const FloatSize& deviceSize, float devicePixelRatio)
-{
-    FloatSize result = deviceSize;
-    if (devicePixelRatio != 1)
-        result.scale(1 / devicePixelRatio);
-    return result;
-}
-
-ViewportAttributes computeViewportAttributes(ViewportArguments args, int desktopWidth, int deviceWidth, int deviceHeight, float devicePixelRatio, IntSize visibleViewport)
-{
-    FloatSize initialViewportSize = convertToUserSpace(visibleViewport, devicePixelRatio);
-    FloatSize deviceSize = convertToUserSpace(FloatSize(deviceWidth, deviceHeight), devicePixelRatio);
-
-    return args.resolve(initialViewportSize, deviceSize, desktopWidth);
-}
-
-float computeMinimumScaleFactorForContentContained(const ViewportAttributes& result, const IntSize& visibleViewport, const IntSize& contentsSize)
-{
-    FloatSize viewportSize(visibleViewport);
-    return max<float>(result.minimumScale, max(viewportSize.width() / contentsSize.width(), viewportSize.height() / contentsSize.height()));
-}
-
-void restrictMinimumScaleFactorToViewportSize(ViewportAttributes& result, IntSize visibleViewport, float devicePixelRatio)
-{
-    FloatSize viewportSize = convertToUserSpace(visibleViewport, devicePixelRatio);
-
-    result.minimumScale = max<float>(result.minimumScale, max(viewportSize.width() / result.layoutSize.width(), viewportSize.height() / result.layoutSize.height()));
-}
-
-void restrictScaleFactorToInitialScaleIfNotUserScalable(ViewportAttributes& result)
-{
-    if (!result.userScalable)
-        result.maximumScale = result.minimumScale = result.initialScale;
-}
-
 static float numericPrefix(const String& keyString, const String& valueString, Document* document, bool* ok = 0)
 {
     size_t parsedLength;
     float value;
     if (valueString.is8Bit())
         value = charactersToFloat(valueString.characters8(), valueString.length(), parsedLength);
     else
         value = charactersToFloat(valueString.characters16(), valueString.length(), parsedLength);
     if (!parsedLength) {
         reportViewportWarning(document, UnrecognizedViewportArgumentValueError, valueString, keyString);
@@ skipping 163 matching lines @@
         message.replace("%replacement2", replacement2);
 
     if ((errorCode == UnrecognizedViewportArgumentValueError || errorCode == TruncatedViewportArgumentValueError) && replacement1.find(';') != WTF::notFound)
         message.append(" Note that ';' is not a separator in viewport values. The list should be comma-separated.");
 
     // FIXME: This message should be moved off the console once a solution to https://bugs.webkit.org/show_bug.cgi?id=103274 exists.
     document->addConsoleMessage(RenderingMessageSource, viewportErrorMessageLevel(errorCode), message);
 }
 
 } // namespace WebCore