Changeset 64764 in webkit

Timestamp:

Aug 5, 2010 10:50:27 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-05 Kenneth Rohde Christiansen <​kenneth.christiansen@openbossa.org>

Reviewed by Simon Hausmann.

Make the viewport meta tag parser support the Android
target-densitydpi extension.
​http://webkit.org/b/43492

​http://developer.android.com/reference/android/webkit/WebView.html
Section 'Building web pages to support different screen densities'

• dom/ViewportArguments.cpp: (WebCore::setViewportFeature): (WebCore::viewportErrorMessageTemplate):
• dom/ViewportArguments.h: (WebCore::): (WebCore::ViewportArguments::ViewportArguments): (WebCore::ViewportArguments::hasCustomArgument):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ViewportArguments.cpp (modified) (3 diffs)
• dom/ViewportArguments.h (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-05  Kenneth Rohde Christiansen  <kenneth.christiansen@openbossa.org>
+
+        Reviewed by Simon Hausmann.
+
+        Make the viewport meta tag parser support the Android
+        target-densitydpi extension.
+        http://webkit.org/b/43492
+
+        http://developer.android.com/reference/android/webkit/WebView.html
+        Section 'Building web pages to support different screen densities'
+
+        * dom/ViewportArguments.cpp:
+        (WebCore::setViewportFeature):
+        (WebCore::viewportErrorMessageTemplate):
+        * dom/ViewportArguments.h:
+        (WebCore::):
+        (WebCore::ViewportArguments::ViewportArguments):
+        (WebCore::ViewportArguments::hasCustomArgument):
+
 2010-08-05  Jian Li  <jianli@chromium.org>
  

trunk/WebCore/dom/ViewportArguments.cpp

@@ -54 +54 @@
         if (document->page())
             value = document->page()->chrome()->windowRect().height();
+    } else if (equalIgnoringCase(valueString, "device-dpi")) {
+        didUseConstants = true;
+        // Default of today is 160dpi, resulting in a scaleFactor of 1.0.
+        if (document->page())
+            value = 160 * document->page()->chrome()->scaleFactor();
+    } else if (equalIgnoringCase(valueString, "low-dpi")) {
+        didUseConstants = true;
+        value = 120;
+    } else if (equalIgnoringCase(valueString, "medium-dpi")) {
+        didUseConstants = true;
+        value = 160;
+    } else if (equalIgnoringCase(valueString, "high-dpi")) {
+        didUseConstants = true;
+        value = 240;
     } else if (equalIgnoringCase(valueString, "default")) // This allows us to distinguish the omission of a key from asking for the default value.
         value = -2;
@@ -81 +95 @@
         else if (document->page() && value == document->page()->chrome()->windowRect().height() && !didUseConstants)
             reportViewportWarning(document, DeviceHeightShouldBeUsedWarning, keyString);
-        
         arguments->height = value;
+    } else if (keyString == "target-densitydpi" || keyString == "target-densityDpi") {
+        if (!didUseConstants && (value < 70 || value > 400))
+            reportViewportWarning(document, TargetDensityDpiTooSmallOrLargeError, keyString);
+        arguments->targetDensityDpi = value;
     } else
         reportViewportWarning(document, UnrecognizedViewportArgumentError, keyString);
@@ -89 +106 @@
 static const char* viewportErrorMessageTemplate(ViewportErrorCode errorCode)
 {
-    static const char* const errors[] = { 
+    static const char* const errors[] = {
         "Viewport width or height set to physical device width, try using \"device-width\" constant instead for future compatibility.",
         "Viewport height or height set to physical device height, try using \"device-height\" constant instead for future compatibility.",
         "Viewport argument \"%replacement\" not recognized. Content ignored.",
-        "Viewport maximum-scale cannot be larger than 10.0.  The maximum-scale will be set to 10.0."
+        "Viewport maximum-scale cannot be larger than 10.0.  The maximum-scale will be set to 10.0.",
+        "Viewport target-densitydpi has to take a number between 70 and 400 as a valid target dpi, try using \"device-dpi\", \"low-dpi\", \"medium-dpi\" or \"high-dpi\" instead for future compatibility."
     };
 

trunk/WebCore/dom/ViewportArguments.h

@@ -36 +36 @@
     DeviceHeightShouldBeUsedWarning,
     UnrecognizedViewportArgumentError,
-    MaximumScaleTooLargeError
+    MaximumScaleTooLargeError,
+    TargetDensityDpiTooSmallOrLargeError
 };
 
@@ -49 +50 @@
         , width(ValueUndefined)
         , height(ValueUndefined)
+        , targetDensityDpi(ValueUndefined)
         , userScalable(ValueUndefined)
     {
@@ -58 +60 @@
     float width;
     float height;
+    float targetDensityDpi;
 
     float userScalable;
@@ -63 +66 @@
     bool hasCustomArgument() const
     {
-        return initialScale != ValueUndefined || minimumScale != ValueUndefined || maximumScale != ValueUndefined || width != ValueUndefined || height != ValueUndefined || userScalable != ValueUndefined;
+        return initialScale != ValueUndefined || minimumScale != ValueUndefined || maximumScale != ValueUndefined || width != ValueUndefined || height != ValueUndefined || userScalable != ValueUndefined || targetDensityDpi != ValueUndefined;
     }
 };