Make configurationForViewport match production code

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-2013 Intel Corporation. All rights reserved.
  *
@@ skipping 50 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;
 }
 
-PageScaleConstraints ViewportArguments::resolve(const FloatSize& initialViewportSize, const FloatSize& deviceSize, int defaultWidth) const
+PageScaleConstraints ViewportArguments::resolve(const FloatSize& initialViewportSize, 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;
@@ skipping 79 matching lines @@
         result.minimumScale = resultMinZoom;
         result.maximumScale = resultMaxZoom;
         result.initialScale = resultZoom;
         result.layoutSize.setWidth(resultWidth);
         result.layoutSize.setHeight(resultHeight);
         return result;
     }
 
     switch (static_cast<int>(resultWidth)) {
     case ViewportArguments::ValueDeviceWidth:
-        resultWidth = deviceSize.width();
+        resultWidth = initialViewportSize.width();
         break;
     case ViewportArguments::ValueDeviceHeight:
-        resultWidth = deviceSize.height();
+        resultWidth = initialViewportSize.height();
         break;
     }
 
     switch (static_cast<int>(resultHeight)) {
     case ViewportArguments::ValueDeviceWidth:
-        resultHeight = deviceSize.width();
+        resultHeight = initialViewportSize.width();
         break;
     case ViewportArguments::ValueDeviceHeight:
-        resultHeight = deviceSize.height();
+        resultHeight = initialViewportSize.height();
         break;
     }
 
     if (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);
@@ skipping 241 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