Use css-device-adapt constraining for legacy viewport tags.

Source/core/dom/ViewportArguments.h

 /*
  * 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 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 31 matching lines @@
     UnrecognizedViewportArgumentValueError,
     TruncatedViewportArgumentValueError,
     MaximumScaleTooLargeError,
     TargetDensityDpiUnsupported
 };
 
 struct ViewportArguments {
 
     enum Type {
         // These are ordered in increasing importance.
-        Implicit,
-        XHTMLMobileProfile,
+        UserAgent,
         HandheldFriendlyMeta,
         MobileOptimizedMeta,
         ViewportMeta,
-        ViewportMetaLayoutSizeQuirk,
         CSSDeviceAdaptation

[kenneth.r.christiansen, 2013/09/02 09:10:49]

Maybe rename to StyleSheet ?

[rune, 2013/09/02 11:29:30]

Yes. Perhaps:

UserAgent => UserAgentStyleSheet (or UAStyleSheet)
CSSDeviceAdaptation => AuthorStyleSheet

[rune, 2013/09/02 11:53:39]

Done.

     } type;
 
     enum {
         ValueAuto = -1,
         ValueDeviceWidth = -2,
         ValueDeviceHeight = -3,
         ValuePortrait = -4,
         ValueLandscape = -5,
         ValueDeviceDPI = -6,
         ValueLowDPI = -7,
         ValueMediumDPI = -8,
         ValueHighDPI = -9,
         ValueExtendToZoom = -10
     };
 
-    ViewportArguments(Type type = Implicit)
+    ViewportArguments(Type type = UserAgent)
         : type(type)
-        , width(ValueAuto)
         , minWidth(ValueAuto)
         , maxWidth(ValueAuto)
-        , height(ValueAuto)
         , minHeight(ValueAuto)
         , maxHeight(ValueAuto)
         , zoom(ValueAuto)
         , minZoom(ValueAuto)
         , maxZoom(ValueAuto)
         , userZoom(ValueAuto)
         , orientation(ValueAuto)
         , deprecatedTargetDensityDPI(ValueAuto)
     {
     }
 
     // All arguments are in CSS units.
-    PageScaleConstraints resolve(const FloatSize& initialViewportSize, int defaultWidth) const;
+    PageScaleConstraints resolve(const FloatSize& initialViewportSize) const;
 
-    float width;
     float minWidth;
     float maxWidth;
-    float height;
     float minHeight;
     float maxHeight;
     float zoom;
     float minZoom;
     float maxZoom;
     float userZoom;
     float orientation;
     float deprecatedTargetDensityDPI; // Only used for Android WebView
 
     bool operator==(const ViewportArguments& other) const
     {
-        // Used for figuring out whether to reset the viewport or not,
-        // thus we are not taking type into account.
-        return width == other.width
-            && minWidth == other.minWidth
+        // Used for figuring out whether to reset the viewport or not.
+        return minWidth == other.minWidth
             && maxWidth == other.maxWidth
-            && height == other.height
             && minHeight == other.minHeight
             && maxHeight == other.maxHeight
             && zoom == other.zoom
             && minZoom == other.minZoom
             && maxZoom == other.maxZoom
             && userZoom == other.userZoom
             && orientation == other.orientation
             && deprecatedTargetDensityDPI == other.deprecatedTargetDensityDPI;
     }
 
     bool operator!=(const ViewportArguments& other) const
     {
         return !(*this == other);
     }
 };
 
 void setViewportFeature(const String& keyString, const String& valueString, Document*, void* data);
 void reportViewportWarning(Document*, ViewportErrorCode, const String& replacement1, const String& replacement2);
 
 } // namespace WebCore
 
 #endif // ViewportArguments_h