Changeset 140172 in webkit

Timestamp:

Jan 18, 2013, 10:17:47 AM (12 years ago)

Author:

kerz@chromium.org

Message:

Land two patches for testing

Location:

branches/chromium/1387/Source/WebKit/chromium/src

Files:

• ChromeClientImpl.cpp (modified) (3 diffs)
• WebViewImpl.cpp (modified) (13 diffs)
• WebViewImpl.h (modified) (4 diffs)

branches/chromium/1387/Source/WebKit/chromium/src/ChromeClientImpl.cpp

@@ -97 +97 @@
 #include "WebPopupType.h"
 #include "WebSettings.h"
+#include "WebSettingsImpl.h"
 #include "WebTextDirection.h"
 #include "WebViewClient.h"
@@ -644 +645 @@
         return;
 
-    WebViewClient* client = m_webView->client();
-    WebSize deviceSize = m_webView->size();
-    // If the window size has not been set yet don't attempt to set the viewport
-    if (!deviceSize.width || !deviceSize.height)
-        return;
-
-    int viewportWidthInDIPs = m_webView->dipSize().width();
-    ViewportArguments effectiveViewportArguments;
-    int effectiveFallbackWidth;
+    IntSize viewportSize = m_webView->dipSize();
+    float deviceScaleFactor = m_webView->client()->screenInfo().deviceScaleFactor;
+
+    // If the window size has not been set yet don't attempt to set the viewport.
+    if (!viewportSize.width() || !viewportSize.height())
+        return;
+
+    ViewportAttributes computed;
     if (m_webView->settings()->viewportEnabled()) {
-        effectiveViewportArguments = arguments;
-        effectiveFallbackWidth = std::max(m_webView->page()->settings()->layoutFallbackWidth(), viewportWidthInDIPs);
+        computed = arguments.resolve(viewportSize, viewportSize, m_webView->page()->settings()->layoutFallbackWidth());
     } 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(
-        effectiveViewportArguments, effectiveFallbackWidth, deviceSize.width, deviceSize.height,
-        devicePixelRatio, IntSize(deviceSize.width, deviceSize.height));
-
+        // If viewport tag is disabled but fixed layout is still enabled, (for
+        // example, on Android WebView with UseWideViewport false), compute
+        // based on the default viewport arguments.
+        computed = ViewportArguments().resolve(viewportSize, viewportSize, viewportSize.width());
+    }
     restrictScaleFactorToInitialScaleIfNotUserScalable(computed);
 
@@ -675 +667 @@
         computed.userScalable = true;
     }
-
-    int layoutWidth = computed.layoutSize.width();
-    int layoutHeight = computed.layoutSize.height();
-    m_webView->setFixedLayoutSize(IntSize(layoutWidth, layoutHeight));
+    if (!m_webView->settingsImpl()->applyDeviceScaleFactorInCompositor())
+        computed.initialScale *= deviceScaleFactor;
 
     bool needInitializePageScale = !m_webView->isPageScaleFactorSet();
-    m_webView->setDeviceScaleFactor(devicePixelRatio);
+    IntSize fixedLayoutSize = flooredIntSize(computed.layoutSize);
+    if (viewportSize.width() > fixedLayoutSize.width())
+        fixedLayoutSize = viewportSize;
+    m_webView->setFixedLayoutSize(fixedLayoutSize);
+    m_webView->setDeviceScaleFactor(deviceScaleFactor);
     m_webView->setPageScaleFactorLimits(computed.minimumScale, computed.maximumScale);
     if (needInitializePageScale)
-        m_webView->setPageScaleFactorPreservingScrollOffset(computed.initialScale * devicePixelRatio);
+        m_webView->setPageScaleFactorPreservingScrollOffset(computed.initialScale);
 #endif
 }

branches/chromium/1387/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -429 +429 @@
     , m_recreatingGraphicsContext(false)
     , m_compositorSurfaceReady(false)
-    , m_deviceScaleInCompositor(1)
     , m_inputHandlerIdentifier(-1)
 #endif
@@ -1581 +1580 @@
 }
 
+WebSize WebViewImpl::size()
+{
+    if (isFixedLayoutModeEnabled() && settingsImpl()->applyPageScaleFactorInCompositor())
+        return layoutSize();
+
+    return m_size;
+}
+
 void WebViewImpl::resize(const WebSize& newSize)
 {
@@ -1608 +1615 @@
         WebFrameImpl* webFrame = mainFrameImpl();
         if (webFrame->frameView())
-            webFrame->frameView()->resize(newSize.width, newSize.height);
+            webFrame->frameView()->resize(size());
     }
 
 #if ENABLE(VIEWPORT)
     if (settings()->viewportEnabled()) {
-        // Relayout immediately to obtain the new content width, which is needed
-        // to calculate the minimum scale limit.
-        view->layout();
+        if (!settingsImpl()->applyPageScaleFactorInCompositor()) {
+            // Relayout immediately to obtain the new content width, which is needed
+            // to calculate the minimum scale limit.
+            view->layout();
+        }
         computePageScaleFactorLimits();
+
         // When the device rotates:
         // - If the page width is unchanged, then zoom by new width/old width
@@ -1632 +1642 @@
         if (scaleMultiplier != 1) {
             IntSize scrollOffsetAtNewScale = oldScrollOffset;
-            scrollOffsetAtNewScale.scale(scaleMultiplier);
+            if (!settingsImpl()->applyPageScaleFactorInCompositor())
+                scrollOffsetAtNewScale.scale(scaleMultiplier);
             setPageScaleFactor(oldPageScaleFactor * scaleMultiplier, IntPoint(scrollOffsetAtNewScale));
         }
@@ -2916 +2927 @@
         scaleFactor = 1;
 
-    if (m_deviceScaleInCompositor != 1) {
-        // Don't allow page scaling when compositor scaling is being used,
-        // as they are currently incompatible.
-        ASSERT(scaleFactor == 1);
-    }
-
     scaleFactor = clampPageScaleFactorToLimits(scaleFactor);
     WebPoint scrollOffset;
@@ -2955 +2960 @@
     page()->setDeviceScaleFactor(scaleFactor);
 
-    if (m_layerTreeView && m_webSettings->applyDeviceScaleFactorInCompositor()) {
-        m_deviceScaleInCompositor = page()->deviceScaleFactor();
-        m_layerTreeView->setDeviceScaleFactor(m_deviceScaleInCompositor);
-    }
-    if (m_deviceScaleInCompositor != 1) {
-        // Don't allow page scaling when compositor scaling is being used,
-        // as they are currently incompatible. This means the deviceScale
-        // needs to match the one in the compositor.
-        ASSERT(scaleFactor == m_deviceScaleInCompositor);
-    }
+    if (m_layerTreeView && m_webSettings->applyDeviceScaleFactorInCompositor())
+        m_layerTreeView->setDeviceScaleFactor(scaleFactor);
 }
 
@@ -3037 +3034 @@
 }
 
+IntSize WebViewImpl::layoutSize() const
+{
+    if (!isFixedLayoutModeEnabled())
+        return m_size;
+
+    IntSize contentSize = unscaledContentsSize(page()->mainFrame());
+    if (fixedLayoutSize().width >= contentSize.width())
+        return fixedLayoutSize();
+
+    float aspectRatio = static_cast<float>(m_size.height) / m_size.width;
+    return IntSize(contentSize.width(), contentSize.width() * aspectRatio);
+}
+
 bool WebViewImpl::computePageScaleFactorLimits()
 {
@@ -3045 +3055 @@
         return false;
 
-    m_minimumPageScaleFactor = min(max(m_pageDefinedMinimumPageScaleFactor, minPageScaleFactor), maxPageScaleFactor) * (deviceScaleFactor() / m_deviceScaleInCompositor);
-    m_maximumPageScaleFactor = max(min(m_pageDefinedMaximumPageScaleFactor, maxPageScaleFactor), minPageScaleFactor) * (deviceScaleFactor() / m_deviceScaleInCompositor);
-
-    int viewWidthNotIncludingScrollbars = page()->mainFrame()->view()->visibleContentRect(false).width();
+    FrameView* view = page()->mainFrame()->view();
+
+    m_minimumPageScaleFactor = min(max(m_pageDefinedMinimumPageScaleFactor, minPageScaleFactor), maxPageScaleFactor);
+    m_maximumPageScaleFactor = max(min(m_pageDefinedMaximumPageScaleFactor, maxPageScaleFactor), minPageScaleFactor);
+    if (!m_webSettings->applyDeviceScaleFactorInCompositor()) {
+        m_minimumPageScaleFactor *= deviceScaleFactor();
+        m_maximumPageScaleFactor *= deviceScaleFactor();
+    }
+
+    int viewWidthNotIncludingScrollbars = m_size.width;
+    if (viewWidthNotIncludingScrollbars && view->verticalScrollbar() && !view->verticalScrollbar()->isOverlayScrollbar())
+        viewWidthNotIncludingScrollbars -= view->verticalScrollbar()->width();
     int unscaledContentsWidth = unscaledContentsSize(page()->mainFrame()).width();
     if (viewWidthNotIncludingScrollbars && unscaledContentsWidth) {
@@ -3147 +3165 @@
 }
 
-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);
+WebCore::IntSize WebViewImpl::dipSize() const
+{
+    IntSize dipSize = m_size;
+    if (!m_webSettings->applyDeviceScaleFactorInCompositor())
+        dipSize.scale(1 / m_client->screenInfo().deviceScaleFactor);
+    return dipSize;
 }
 
@@ -3698 +3715 @@
 {
 #if ENABLE(VIEWPORT)
-    if (!settings()->viewportEnabled())
-        return;
-
-    bool didChangeScale = false;
+    if (!settings()->viewportEnabled() || !mainFrameImpl())
+        return;
+
+    bool mayNeedLayout = false;
     if (!isPageScaleFactorSet()) {
         // If the viewport tag failed to be processed earlier, we need
@@ -3707 +3724 @@
         ViewportArguments viewportArguments = mainFrameImpl()->frame()->document()->viewportArguments();
         m_page->chrome()->client()->dispatchViewportPropertiesDidChange(viewportArguments);
-        didChangeScale = true;
+        mayNeedLayout = true;
     } else
-        didChangeScale = computePageScaleFactorLimits();
-
-    if (!didChangeScale)
-        return;
-
-    if (!mainFrameImpl())
-        return;
+        mayNeedLayout = computePageScaleFactorLimits();
 
     FrameView* view = mainFrameImpl()->frameView();
-    if (view && view->needsLayout())
+    if (settingsImpl()->applyPageScaleFactorInCompositor() && view && view->visibleContentRect(true).width() != layoutSize().width()) {
+        view->resize(layoutSize());
+        mayNeedLayout = true;
+    }
+
+    // didChangeContentsSize() may be called from FrameView::layout; we need to
+    // relayout to avoid triggering the assertion that needsLayout() isn't set
+    // at the end of a layout.
+    if (mayNeedLayout && view && view->needsLayout())
         view->layout();
 #endif
@@ -4054 +4073 @@
         }
         if (m_layerTreeView) {
-            if (m_webSettings->applyDeviceScaleFactorInCompositor() && page()->deviceScaleFactor() != 1) {
-                ASSERT(page()->deviceScaleFactor());
-
-                m_deviceScaleInCompositor = page()->deviceScaleFactor();
-                setDeviceScaleFactor(m_deviceScaleInCompositor);
-            }
+            if (m_webSettings->applyDeviceScaleFactorInCompositor() && page()->deviceScaleFactor() != 1)
+                setDeviceScaleFactor(page()->deviceScaleFactor());
 
             bool visible = page()->visibilityState() == PageVisibilityStateVisible;
@@ -4198 +4213 @@
     m_nonCompositedContentHost->setViewport(visibleRect.size(), view->contentsSize(), scroll, view->scrollOrigin());
 
-    IntSize layoutViewportSize = size();
-    IntSize deviceViewportSize = size();
-
-    // This part of the deviceScale will be used to scale the contents of
-    // the NCCH's GraphicsLayer.
-    deviceViewportSize.scale(m_deviceScaleInCompositor);
+    IntSize layoutViewportSize = visibleRect.size();
+    IntSize deviceViewportSize = m_size;
+    if (m_webSettings->applyDeviceScaleFactorInCompositor())
+        deviceViewportSize.scale(deviceScaleFactor());
+
     m_layerTreeView->setViewportSize(layoutViewportSize, deviceViewportSize);
     m_layerTreeView->setPageScaleFactorAndLimits(pageScaleFactor(), m_minimumPageScaleFactor, m_maximumPageScaleFactor);

branches/chromium/1387/Source/WebKit/chromium/src/WebViewImpl.h

@@ -137 +137 @@
     // WebWidget methods:
     virtual void close();
-    virtual WebSize size() { return m_size; }
+    virtual WebSize size();
     virtual void willStartLiveResize();
     virtual void resize(const WebSize&);
@@ -244 +244 @@
     virtual WebSize fixedLayoutSize() const;
     virtual void setFixedLayoutSize(const WebSize&);
-    virtual WebCore::FloatSize dipSize() const;
     virtual void enableAutoResizeMode(
         const WebSize& minSize,
@@ -461 +460 @@
     }
 
+    WebCore::IntSize dipSize() const;
+    WebCore::IntSize layoutSize() const;
+
     // Set the disposition for how this webview is to be initially shown.
     void setInitialNavigationPolicy(WebNavigationPolicy policy)
@@ -852 +854 @@
     bool m_recreatingGraphicsContext;
     bool m_compositorSurfaceReady;
-    float m_deviceScaleInCompositor;
     int m_inputHandlerIdentifier;
 #endif