Changeset 147529 in webkit

Timestamp:

Apr 3, 2013 2:19:11 AM (11 years ago)

Author:

mnaganov@chromium.org

Message:

[Chromium] Implement target-densityDpi viewport property emulation
​https://bugs.webkit.org/show_bug.cgi?id=110835

The value is only used in the Chromium port, when the corresponding
setting is enabled.

This is needed for supporting existing WebView-based applications
that rely on this property.

Reviewed by Adam Barth.

Source/WebCore:

• dom/ViewportArguments.cpp:

(WebCore::findTargetDensityDPIValue):
(WebCore):
(WebCore::setViewportFeature):

• dom/ViewportArguments.h:

(WebCore::ViewportArguments::ViewportArguments):
(ViewportArguments):
(WebCore::ViewportArguments::operator==):

Source/WebKit/chromium:

• public/WebSettings.h:

(WebSettings):

• src/ChromeClientImpl.cpp:

(WebKit):
(WebKit::calculateTargetDensityDPIFactor):
(WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange):

• src/WebSettingsImpl.cpp:

(WebKit::WebSettingsImpl::WebSettingsImpl):
(WebKit::WebSettingsImpl::setSupportDeprecatedTargetDensityDPI):
(WebKit):

• src/WebSettingsImpl.h:

(WebSettingsImpl):
(WebKit::WebSettingsImpl::supportDeprecatedTargetDensityDPI):

• tests/WebFrameTest.cpp:
• tests/data/viewport-target-densitydpi-high.html: Added.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/ViewportArguments.cpp (modified) (2 diffs)
• WebCore/dom/ViewportArguments.h (modified) (4 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebSettings.h (modified) (1 diff)
• WebKit/chromium/src/ChromeClientImpl.cpp (modified) (2 diffs)
• WebKit/chromium/src/WebSettingsImpl.cpp (modified) (2 diffs)
• WebKit/chromium/src/WebSettingsImpl.h (modified) (3 diffs)
• WebKit/chromium/tests/WebFrameTest.cpp (modified) (1 diff)
• WebKit/chromium/tests/data/viewport-target-densitydpi-high.html (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-03  Mikhail Naganov  <mnaganov@chromium.org>
+
+        [Chromium] Implement target-densityDpi viewport property emulation
+        https://bugs.webkit.org/show_bug.cgi?id=110835
+
+        The value is only used in the Chromium port, when the corresponding
+        setting is enabled.
+
+        This is needed for supporting existing WebView-based applications
+        that rely on this property.
+
+        Reviewed by Adam Barth.
+
+        * dom/ViewportArguments.cpp:
+        (WebCore::findTargetDensityDPIValue):
+        (WebCore):
+        (WebCore::setViewportFeature):
+        * dom/ViewportArguments.h:
+        (WebCore::ViewportArguments::ViewportArguments):
+        (ViewportArguments):
+        (WebCore::ViewportArguments::operator==):
+
 2013-04-03  Mike West  <mkwst@chromium.org>
 

trunk/Source/WebCore/dom/ViewportArguments.cpp

@@ -383 +383 @@
 }
 
+static float findTargetDensityDPIValue(const String& keyString, const String& valueString, Document* document)
+{
+    if (equalIgnoringCase(valueString, "device-dpi"))
+        return ViewportArguments::ValueDeviceDPI;
+    if (equalIgnoringCase(valueString, "low-dpi"))
+        return ViewportArguments::ValueLowDPI;
+    if (equalIgnoringCase(valueString, "medium-dpi"))
+        return ViewportArguments::ValueMediumDPI;
+    if (equalIgnoringCase(valueString, "high-dpi"))
+        return ViewportArguments::ValueHighDPI;
+
+    bool ok;
+    float value = numericPrefix(keyString, valueString, document, &ok);
+    if (!ok || value < 70 || value > 400)
+        return ViewportArguments::ValueAuto;
+
+    return value;
+}
+
 void setViewportFeature(const String& keyString, const String& valueString, Document* document, void* data)
 {
@@ -399 +418 @@
     else if (keyString == "user-scalable")
         arguments->userZoom = findUserScalableValue(keyString, valueString, document);
-    else if (keyString == "target-densitydpi")
+    else if (keyString == "target-densitydpi") {
+        arguments->deprecatedTargetDensityDPI = findTargetDensityDPIValue(keyString, valueString, document);
         reportViewportWarning(document, TargetDensityDpiUnsupported, String(), String());
-    else
+    } else
         reportViewportWarning(document, UnrecognizedViewportArgumentKeyError, keyString, String());
 }

trunk/Source/WebCore/dom/ViewportArguments.h

@@ -74 +74 @@
         ValueDeviceHeight = -3,
         ValuePortrait = -4,
-        ValueLandscape = -5
+        ValueLandscape = -5,
+        ValueDeviceDPI = -6,
+        ValueLowDPI = -7,
+        ValueMediumDPI = -8,
+        ValueHighDPI = -9
     };
 
@@ -90 +94 @@
         , userZoom(ValueAuto)
         , orientation(ValueAuto)
+        , deprecatedTargetDensityDPI(ValueAuto)
     {
     }
@@ -107 +112 @@
     float userZoom;
     float orientation;
+    float deprecatedTargetDensityDPI; // Only used for Android WebView
 
     bool operator==(const ViewportArguments& other) const
@@ -122 +128 @@
             && maxZoom == other.maxZoom
             && userZoom == other.userZoom
-            && orientation == other.orientation;
+            && orientation == other.orientation
+            && deprecatedTargetDensityDPI == other.deprecatedTargetDensityDPI;
     }
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-04-03  Mikhail Naganov  <mnaganov@chromium.org>
+
+        [Chromium] Implement target-densityDpi viewport property emulation
+        https://bugs.webkit.org/show_bug.cgi?id=110835
+
+        The value is only used in the Chromium port, when the corresponding
+        setting is enabled.
+
+        This is needed for supporting existing WebView-based applications
+        that rely on this property.
+
+        Reviewed by Adam Barth.
+
+        * public/WebSettings.h:
+        (WebSettings):
+        * src/ChromeClientImpl.cpp:
+        (WebKit):
+        (WebKit::calculateTargetDensityDPIFactor):
+        (WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange):
+        * src/WebSettingsImpl.cpp:
+        (WebKit::WebSettingsImpl::WebSettingsImpl):
+        (WebKit::WebSettingsImpl::setSupportDeprecatedTargetDensityDPI):
+        (WebKit):
+        * src/WebSettingsImpl.h:
+        (WebSettingsImpl):
+        (WebKit::WebSettingsImpl::supportDeprecatedTargetDensityDPI):
+        * tests/WebFrameTest.cpp:
+        * tests/data/viewport-target-densitydpi-high.html: Added.
+
 2013-04-02  James Craig  <james@cookiecrook.com>
 

trunk/Source/WebKit/chromium/public/WebSettings.h

@@ -154 +154 @@
     virtual void setSmartInsertDeleteEnabled(bool) = 0;
     virtual void setStandardFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
+    virtual void setSupportDeprecatedTargetDensityDPI(bool) = 0;
     virtual void setSupportsMultipleWindows(bool) = 0;
     virtual void setSyncXHRInDocumentsEnabled(bool) = 0;

trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp

@@ -625 +625 @@
 }
 
+
+static float calculateTargetDensityDPIFactor(const ViewportArguments& arguments, float deviceScaleFactor)
+{
+    float targetDPI = -1.0f;
+    if (arguments.deprecatedTargetDensityDPI == ViewportArguments::ValueLowDPI)
+        targetDPI = 120.0f;
+    else if (arguments.deprecatedTargetDensityDPI == ViewportArguments::ValueMediumDPI)
+        targetDPI = 160.0f;
+    else if (arguments.deprecatedTargetDensityDPI == ViewportArguments::ValueHighDPI)
+        targetDPI = 240.0f;
+    else if (arguments.deprecatedTargetDensityDPI != ViewportArguments::ValueAuto && arguments.deprecatedTargetDensityDPI != ViewportArguments::ValueDeviceDPI)
+        targetDPI = arguments.deprecatedTargetDensityDPI;
+    return targetDPI > 0 ? (deviceScaleFactor * 120.0f) / targetDPI : 1.0f;
+}
+
 void ChromeClientImpl::dispatchViewportPropertiesDidChange(const ViewportArguments& arguments) const
 {
@@ -647 +662 @@
     if (arguments.zoom == ViewportArguments::ValueAuto && !m_webView->settingsImpl()->initializeAtMinimumPageScale())
         computed.initialScale = 1.0f;
+
+    if (m_webView->settingsImpl()->supportDeprecatedTargetDensityDPI()) {
+        float targetDensityDPIFactor = calculateTargetDensityDPIFactor(arguments, deviceScaleFactor);
+        computed.initialScale *= targetDensityDPIFactor;
+        computed.minimumScale *= targetDensityDPIFactor;
+        computed.maximumScale *= targetDensityDPIFactor;
+        computed.layoutSize.scale(1.0f / targetDensityDPIFactor);
+    }
 
     m_webView->setInitialPageScaleFactor(computed.initialScale);

trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp

@@ -58 +58 @@
     , m_deferredImageDecodingEnabled(false)
     , m_doubleTapToZoomEnabled(false)
+    , m_supportDeprecatedTargetDensityDPI(false)
 {
     ASSERT(settings);
@@ -195 +196 @@
 }
 
+void WebSettingsImpl::setSupportDeprecatedTargetDensityDPI(bool supportDeprecatedTargetDensityDPI)
+{
+    m_supportDeprecatedTargetDensityDPI = supportDeprecatedTargetDensityDPI;
+}
+
 void WebSettingsImpl::setSupportsMultipleWindows(bool supportsMultipleWindows)
 {

trunk/Source/WebKit/chromium/src/WebSettingsImpl.h

@@ -150 +150 @@
     virtual void setSmartInsertDeleteEnabled(bool);
     virtual void setStandardFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
+    virtual void setSupportDeprecatedTargetDensityDPI(bool);
     virtual void setSupportsMultipleWindows(bool);
     virtual void setSyncXHRInDocumentsEnabled(bool);
@@ -181 +182 @@
     bool doubleTapToZoomEnabled() const { return m_doubleTapToZoomEnabled; }
     bool perTilePaintingEnabled() const { return m_perTilePaintingEnabled; }
+    bool supportDeprecatedTargetDensityDPI() const { return m_supportDeprecatedTargetDensityDPI; }
 
 private:
@@ -194 +196 @@
     bool m_doubleTapToZoomEnabled;
     bool m_perTilePaintingEnabled;
+    bool m_supportDeprecatedTargetDensityDPI;
 };
 

trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp

@@ -574 +574 @@
     EXPECT_EQ(980, webViewImpl->mainFrameImpl()->frameView()->contentsSize().width());
 }
+
+TEST_F(WebFrameTest, targetDensityDpiHigh)
+{
+    registerMockedHttpURLLoad("viewport-target-densitydpi-high.html");
+
+    FixedLayoutTestWebViewClient client;
+    client.m_screenInfo.deviceScaleFactor = 4.0f / 3.0f;
+    int viewportWidth = 640;
+    int viewportHeight = 480;
+
+    m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-target-densitydpi-high.html", true, 0, &client);
+    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
+    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
+    m_webView->enableFixedLayoutMode(true);
+    m_webView->settings()->setViewportEnabled(true);
+    m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
+    m_webView->resize(WebSize(viewportWidth, viewportHeight));
+
+    // high-dpi = 240, device-dpi = 160
+    EXPECT_EQ(viewportWidth * (240.0f / 160.0f), m_webView->fixedLayoutSize().width);
+    EXPECT_EQ(viewportHeight * (240.0f / 160.0f), m_webView->fixedLayoutSize().height);
+    EXPECT_EQ(160.0f / 240.0f, m_webView->pageScaleFactor());
+}
 #endif