Changeset 139177 in webkit

Timestamp:

Jan 9, 2013 1:37:34 AM (11 years ago)

Author:

mnaganov@chromium.org

Message:

[Chromium] When viewport is disabled, use display width in DIP pixels for the fallback width
​https://bugs.webkit.org/show_bug.cgi?id=106021

This is to emulate 'UseWideViewport' setting of Android WebView properly.
'UseWideViewport' now corresponds to the 'viewportEnabled' setting.
When the value is false, "meta viewport" tag is ignored, and when calculating
layout width, display width in DIP pixels is used.

Reviewed by Adam Barth.

• src/ChromeClientImpl.cpp:

(WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange):

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::resize):
(WebKit::WebViewImpl::dipSize):
(WebKit):

• src/WebViewImpl.h:

(WebCore):
(WebViewImpl):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/ChromeClientImpl.cpp (modified) (2 diffs)
• src/WebViewImpl.cpp (modified) (2 diffs)
• src/WebViewImpl.h (modified) (3 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-01-08  Mikhail Naganov  <mnaganov@chromium.org>
+
+        [Chromium] When viewport is disabled, use display width in DIP pixels for the fallback width
+        https://bugs.webkit.org/show_bug.cgi?id=106021
+
+        This is to emulate 'UseWideViewport' setting of Android WebView properly.
+        'UseWideViewport' now corresponds to the 'viewportEnabled' setting.
+        When the value is false, "meta viewport" tag is ignored, and when calculating
+        layout width, display width in DIP pixels is used.
+
+        Reviewed by Adam Barth.
+
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::resize):
+        (WebKit::WebViewImpl::dipSize):
+        (WebKit):
+        * src/WebViewImpl.h:
+        (WebCore):
+        (WebViewImpl):
+
 2013-01-08  Chris Rogers  <crogers@google.com>
 

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

@@ -621 +621 @@
 {
 #if ENABLE(VIEWPORT)
-    if (!m_webView->settings()->viewportEnabled() || !m_webView->isFixedLayoutModeEnabled() || !m_webView->client() || !m_webView->page())
+    if (!m_webView->isFixedLayoutModeEnabled() || !m_webView->client() || !m_webView->page())
         return;
 
@@ -630 +630 @@
         return;
 
-    Settings* settings = m_webView->page()->settings();
+    int viewportWidthInDIPs = m_webView->dipSize().width();
+    ViewportArguments effectiveViewportArguments;
+    int effectiveFallbackWidth;
+    if (m_webView->settings()->viewportEnabled()) {
+        effectiveViewportArguments = arguments;
+        effectiveFallbackWidth = std::max(m_webView->page()->settings()->layoutFallbackWidth(), viewportWidthInDIPs);
+    } else {
+        // This is for Android WebView to use layout width in device-independent pixels.
+        // Once WebViewImpl on Android will start using DIP pixels size,
+        // dispatchViewportPropertiesDidChange can bail out when viewport is disabled.
+        effectiveViewportArguments = ViewportArguments();
+        effectiveFallbackWidth = viewportWidthInDIPs;
+    }
     float devicePixelRatio = client->screenInfo().deviceScaleFactor;
     // Call the common viewport computing logic in ViewportArguments.cpp.
     ViewportAttributes computed = computeViewportAttributes(
-        arguments, settings->layoutFallbackWidth(), deviceSize.width, deviceSize.height,
+        effectiveViewportArguments, effectiveFallbackWidth, deviceSize.width, deviceSize.height,
         devicePixelRatio, IntSize(deviceSize.width, deviceSize.height));
 

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

@@ -1587 +1587 @@
 
 #if ENABLE(VIEWPORT)
-    if (settings()->viewportEnabled()) {
-        // Fallback width is used to layout sites designed for desktop. The
-        // conventional size used by all mobile browsers is 980. When a mobile
-        // device has a particularly wide screen (such as a 10" tablet held in
-        // landscape), it can be larger.
-        const int standardFallbackWidth = 980;
-        int dpiIndependentViewportWidth = newSize.width / page()->deviceScaleFactor();
-        settings()->setLayoutFallbackWidth(std::max(standardFallbackWidth, dpiIndependentViewportWidth));
-
-        ViewportArguments viewportArguments = mainFrameImpl()->frame()->document()->viewportArguments();
-        m_page->chrome()->client()->dispatchViewportPropertiesDidChange(viewportArguments);
-    }
+    ViewportArguments viewportArguments = mainFrameImpl()->frame()->document()->viewportArguments();
+    m_page->chrome()->client()->dispatchViewportPropertiesDidChange(viewportArguments);
 #endif
 
@@ -3137 +3127 @@
 }
 
+WebCore::FloatSize WebViewImpl::dipSize() const
+{
+    if (!page() || m_webSettings->applyDeviceScaleFactorInCompositor())
+        return FloatSize(m_size.width, m_size.height);
+
+    float deviceScaleFactor = page()->deviceScaleFactor();
+    return FloatSize(m_size.width / deviceScaleFactor, m_size.height / deviceScaleFactor);
+}
+
 void WebViewImpl::performMediaPlayerAction(const WebMediaPlayerAction& action,
                                            const WebPoint& location)

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

@@ -36 +36 @@
 #include "DragClientImpl.h"
 #include "EditorClientImpl.h"
+#include "FloatSize.h"
 #include "GraphicsContext3D.h"
 #include "GraphicsLayer.h"
@@ -65 +66 @@
 class Color;
 class DocumentLoader;
+class FloatSize;
 class Frame;
 class GraphicsContext3D;
@@ -239 +241 @@
     virtual WebSize fixedLayoutSize() const;
     virtual void setFixedLayoutSize(const WebSize&);
+    virtual WebCore::FloatSize dipSize() const;
     virtual void enableAutoResizeMode(
         const WebSize& minSize,