Changeset 147357 in webkit

Timestamp:

Apr 1, 2013 1:48:52 PM (11 years ago)

Author:

aelias@chromium.org

Message:

[chromium] Delete code behind if (!applyXYZScaleInCompositor)
​https://bugs.webkit.org/show_bug.cgi?id=111809

Reviewed by James Robinson.

Chromium is setting the flags applyPageScaleFactorInCompositor and
applyDeviceScaleFactorInCompositor permanently to true, so any code
in platform/chromium with the false setting is dead. Delete all of
it.

I also switched FrameTestHelpers and DumpRenderTree to always turn the
setting to true so that they test the code we're actually running.
This exposed a number of failing tests which I added in the
expectations file.

Note also that I made calls to setPageScaleFactor turn on
force-compositing-mode to make the layout tests work, as
pageScaleFactor is now ignored in non-composited mode.

• src/ChromeClientImpl.cpp:

(WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange):

• src/NonCompositedContentHost.cpp:

(WebKit::NonCompositedContentHost::NonCompositedContentHost):

• src/PageWidgetDelegate.cpp:

(WebKit::PageWidgetDelegate::paint):

• src/PageWidgetDelegate.h:
• src/WebFrameImpl.cpp:

(WebKit::WebFrameImpl::selectRange):
(WebKit::WebFrameImpl::moveCaretSelectionTowardsWindowPoint):

• src/WebPagePopupImpl.cpp:

(WebKit::WebPagePopupImpl::paint):

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::computeScaleAndScrollForHitRect):
(WebKit::WebViewImpl::scaledSize):
(WebKit::WebViewImpl::resize):
(WebKit::WebViewImpl::paint):
(WebKit::WebViewImpl::selectionBounds):
(WebKit::WebViewImpl::computeScaleAndScrollForFocusedNode):
(WebKit::WebViewImpl::clampOffsetAtScale):
(WebKit::WebViewImpl::setPageScaleFactorPreservingScrollOffset):
(WebKit::WebViewImpl::setDeviceScaleFactor):
(WebKit::WebViewImpl::contentsSize):
(WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
(WebKit::WebViewImpl::applyScrollAndScale):

• src/WebViewImpl.h:
• tests/FrameTestHelpers.cpp:

(WebKit::FrameTestHelpers::createWebView):

• tests/WebFrameTest.cpp:
• tests/WebInputEventConversionTest.cpp:

(WebCore::TEST):

Location:

trunk

Files:

• LayoutTests/platform/chromium/TestExpectations (modified) (2 diffs)
• Source/Platform/chromium/public/WebGestureCurveTarget.h (modified) (1 diff)
• Source/WebCore/page/ChromeClient.h (modified) (1 diff)
• Source/WebCore/page/Frame.cpp (modified) (1 diff)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/src/ChromeClientImpl.cpp (modified) (3 diffs)
• Source/WebKit/chromium/src/ChromeClientImpl.h (modified) (1 diff)
• Source/WebKit/chromium/src/PageWidgetDelegate.cpp (modified) (2 diffs)
• Source/WebKit/chromium/src/PageWidgetDelegate.h (modified) (1 diff)
• Source/WebKit/chromium/src/WebFrameImpl.cpp (modified) (2 diffs)
• Source/WebKit/chromium/src/WebPagePopupImpl.cpp (modified) (1 diff)
• Source/WebKit/chromium/src/WebViewImpl.cpp (modified) (21 diffs)
• Source/WebKit/chromium/src/WebViewImpl.h (modified) (2 diffs)
• Source/WebKit/chromium/tests/FrameTestHelpers.cpp (modified) (1 diff)
• Source/WebKit/chromium/tests/WebFrameTest.cpp (modified) (24 diffs)
• Source/WebKit/chromium/tests/WebInputEventConversionTest.cpp (modified) (1 diff)
• Tools/DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp (modified) (1 diff)

trunk/LayoutTests/platform/chromium/TestExpectations

@@ -3621 +3621 @@
 webkit.org/b/106858 [ Mac Debug ] scrollingcoordinator/non-fast-scrollable-region-transformed-iframe.html [ ImageOnlyFailure Crash ]
 webkit.org/b/106858 [ Linux Win Debug ] scrollingcoordinator/non-fast-scrollable-region-transformed-iframe.html [ ImageOnlyFailure Pass ]
-webkit.org/b/106858 [ Mac Debug ] scrollingcoordinator/non-fast-scrollable-region-scaled-iframe.html [ ImageOnlyFailure ]
-webkit.org/b/106858 [ Linux Win Debug ] scrollingcoordinator/non-fast-scrollable-region-scaled-iframe.html [ ImageOnlyFailure Pass ]
 
 # This is won't fix, as the debug and release versions differ.
@@ -3680 +3678 @@
 webkit.org/b/110739 [ Release MountainLion ] fast/regions/shape-inside/shape-inside-on-regions.html [ ImageOnlyFailure ]
 
-# The following tests are are failing since chromium r184584
-webkit.org/b/110851 compositing/geometry/fixed-position-composited-page-scale-smaller-than-viewport.html [ ImageOnlyFailure ]
-webkit.org/b/110851 compositing/geometry/fixed-position-composited-page-scale.html [ ImageOnlyFailure ]
-webkit.org/b/110851 compositing/geometry/fixed-position-iframe-composited-page-scale.html [ ImageOnlyFailure ]
-webkit.org/b/110851 compositing/overflow/overflow-scaled-descendant-overlapping.html [ ImageOnlyFailure ]
-webkit.org/b/110851 compositing/repaint/page-scale-repaint.html [ ImageOnlyFailure ]
-webkit.org/b/110851 platform/chromium/virtual/gpu/compositedscrolling/overflow/overflow-scaled-descendant-overlapping.html [ ImageOnlyFailure ]
-webkit.org/b/110851 platform/chromium/virtual/softwarecompositing/geometry/fixed-position-composited-page-scale.html [ ImageOnlyFailure ]
-webkit.org/b/110851 platform/chromium/virtual/softwarecompositing/geometry/fixed-position-iframe-composited-page-scale.html [ ImageOnlyFailure ]
-webkit.org/b/110851 platform/chromium/virtual/softwarecompositing/geometry/fixed-position-composited-page-scale-smaller-than-viewport.html [ ImageOnlyFailure ]
-webkit.org/b/110851 platform/chromium/virtual/softwarecompositing/overflow/overflow-scaled-descendant-overlapping.html [ ImageOnlyFailure ]
-webkit.org/b/110851 platform/chromium/virtual/softwarecompositing/repaint/page-scale-repaint.html [ ImageOnlyFailure ]
+# Tests failing since applyPageScaleFactorInCompositor enabled
+crbug.com/225184 compositing/geometry/fixed-position-composited-page-scale.html [ ImageOnlyFailure ]
+crbug.com/225184 compositing/geometry/fixed-position-iframe-composited-page-scale.html [ ImageOnlyFailure ]
+crbug.com/225184 compositing/repaint/page-scale-repaint.html [ ImageOnlyFailure ]
+crbug.com/225184 platform/chromium/virtual/gpu/compositedscrolling/overflow/overflow-scaled-descendant-overlapping.html [ ImageOnlyFailure ]
+crbug.com/225184 platform/chromium/virtual/softwarecompositing/geometry/fixed-position-composited-page-scale.html [ ImageOnlyFailure ]
+crbug.com/225184 platform/chromium/virtual/softwarecompositing/geometry/fixed-position-iframe-composited-page-scale.html [ ImageOnlyFailure ]
+crbug.com/225184 platform/chromium/virtual/softwarecompositing/geometry/fixed-position-composited-page-scale-smaller-than-viewport.html [ ImageOnlyFailure ]
+crbug.com/225184 platform/chromium/virtual/softwarecompositing/overflow/overflow-scaled-descendant-overlapping.html [ ImageOnlyFailure ]
+crbug.com/225184 platform/chromium/virtual/softwarecompositing/repaint/page-scale-repaint.html [ ImageOnlyFailure ]
+crbug.com/225184 platform/chromium/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled-scroll.html [ Failure ]
+crbug.com/225184 platform/chromium/virtual/softwarecompositing/layer-creation/fixed-position-out-of-view-scaled.html [ Failure ]
+crbug.com/225184 compositing/layer-creation/fixed-position-out-of-view-scaled.html [ Failure ]
+crbug.com/225184 compositing/layer-creation/fixed-position-out-of-view-scaled-scroll.html [ Failure ]
+crbug.com/225184 fast/events/scale-and-scroll-iframe-body.html [ ImageOnlyFailure ]
+crbug.com/225184 fast/events/scale-and-scroll-iframe-window.html [ ImageOnlyFailure ]
+crbug.com/225184 fast/frames/frame-set-rotation-hit.html [ ImageOnlyFailure ]
+crbug.com/225184 fast/frames/frame-set-scaling-hit.html [ ImageOnlyFailure ]
+crbug.com/225184 fast/repaint/background-scaling.html [ ImageOnlyFailure ]
+crbug.com/225184 fast/repaint/scale-page-shrink.html [ ImageOnlyFailure ]
+crbug.com/225184 platform/chromium/fast/repaint/relayout-fixed-position-after-scale.html [ ImageOnlyFailure ]
+crbug.com/225184 fast/events/scale-and-scroll-body.html [ Failure ]
+crbug.com/225184 fast/events/scroll-in-scaled-page-with-overflow-hidden.html [ Failure ]
+crbug.com/225184 inspector/elements/highlight-node-scaled.html [ Failure ]
+crbug.com/225184 scrollingcoordinator/non-fast-scrollable-region-scaled-iframe.html [ Failure ]
+crbug.com/225184 svg/as-image/image-respects-pageScaleFactor.html [ ImageOnlyFailure ]
 
 # Pixel tests for RTL iframe scrollbar is erroneous. Cannot observe on actual browser.

trunk/Source/Platform/chromium/public/WebGestureCurveTarget.h

@@ -33 +33 @@
 class WebGestureCurveTarget {
 public:
-    virtual void scrollBy(const WebFloatSize& delta) { scrollBy(WebPoint(delta.width, delta.height)); }
-
-    // TODO(aelias): Delete this after WebKit roll.
-    virtual void scrollBy(const WebPoint& delta) { scrollBy(WebFloatSize(delta.x, delta.y)); }
+    virtual void scrollBy(const WebFloatSize& delta) = 0;
 
 protected:

trunk/Source/WebCore/page/ChromeClient.h

@@ -176 +176 @@
 
     virtual void contentsSizeChanged(Frame*, const IntSize&) const = 0;
+    virtual void deviceOrPageScaleFactorChanged() const { }
     virtual void layoutUpdated(Frame*) const { }
     virtual void scrollRectIntoView(const IntRect&) const { }; // Currently only Mac has a non empty implementation.

trunk/Source/WebCore/page/Frame.cpp

@@ -1010 +1010 @@
     if (root && root->compositor())
         root->compositor()->deviceOrPageScaleFactorChanged();
+
+    m_page->chrome()->client()->deviceOrPageScaleFactorChanged();
 }
 #endif

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-04-01  Alexandre Elias  <aelias@chromium.org>
+
+        [chromium] Delete code behind if (!applyXYZScaleInCompositor)
+        https://bugs.webkit.org/show_bug.cgi?id=111809
+
+        Reviewed by James Robinson.
+
+        Chromium is setting the flags applyPageScaleFactorInCompositor and
+        applyDeviceScaleFactorInCompositor permanently to true, so any code
+        in platform/chromium with the false setting is dead. Delete all of
+        it.
+
+        I also switched FrameTestHelpers and DumpRenderTree to always turn the
+        setting to true so that they test the code we're actually running.
+        This exposed a number of failing tests which I added in the
+        expectations file.
+
+        Note also that I made calls to setPageScaleFactor turn on
+        force-compositing-mode to make the layout tests work, as
+        pageScaleFactor is now ignored in non-composited mode.
+
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::dispatchViewportPropertiesDidChange):
+        * src/NonCompositedContentHost.cpp:
+        (WebKit::NonCompositedContentHost::NonCompositedContentHost):
+        * src/PageWidgetDelegate.cpp:
+        (WebKit::PageWidgetDelegate::paint):
+        * src/PageWidgetDelegate.h:
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::selectRange):
+        (WebKit::WebFrameImpl::moveCaretSelectionTowardsWindowPoint):
+        * src/WebPagePopupImpl.cpp:
+        (WebKit::WebPagePopupImpl::paint):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::computeScaleAndScrollForHitRect):
+        (WebKit::WebViewImpl::scaledSize):
+        (WebKit::WebViewImpl::resize):
+        (WebKit::WebViewImpl::paint):
+        (WebKit::WebViewImpl::selectionBounds):
+        (WebKit::WebViewImpl::computeScaleAndScrollForFocusedNode):
+        (WebKit::WebViewImpl::clampOffsetAtScale):
+        (WebKit::WebViewImpl::setPageScaleFactorPreservingScrollOffset):
+        (WebKit::WebViewImpl::setDeviceScaleFactor):
+        (WebKit::WebViewImpl::contentsSize):
+        (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+        (WebKit::WebViewImpl::applyScrollAndScale):
+        * src/WebViewImpl.h:
+        * tests/FrameTestHelpers.cpp:
+        (WebKit::FrameTestHelpers::createWebView):
+        * tests/WebFrameTest.cpp:
+        * tests/WebInputEventConversionTest.cpp:
+        (WebCore::TEST):
+
 2013-03-30  Adam Barth  <abarth@webkit.org>
 

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

@@ -574 +574 @@
 }
 
+void ChromeClientImpl::deviceOrPageScaleFactorChanged() const
+{
+    m_webView->deviceOrPageScaleFactorChanged();
+}
+
 void ChromeClientImpl::layoutUpdated(Frame* frame) const
 {
@@ -626 +631 @@
         return;
 
-    IntSize viewportSize = m_webView->dipSize();
+    IntSize viewportSize = m_webView->size();
     float deviceScaleFactor = m_webView->client()->screenInfo().deviceScaleFactor;
 
@@ -642 +647 @@
     if (arguments.zoom == ViewportArguments::ValueAuto && !m_webView->settingsImpl()->initializeAtMinimumPageScale())
         computed.initialScale = 1.0f;
-    if (!m_webView->settingsImpl()->applyDeviceScaleFactorInCompositor())
-        computed.initialScale *= deviceScaleFactor;
 
     m_webView->setInitialPageScaleFactor(computed.initialScale);

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

@@ -128 +128 @@
     virtual PlatformPageClient platformPageClient() const { return PlatformPageClient(this); }
     virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const;
+    virtual void deviceOrPageScaleFactorChanged() const;
     virtual void layoutUpdated(WebCore::Frame*) const;
     virtual void scrollRectIntoView(

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

@@ -82 +82 @@
 }
 
-void PageWidgetDelegate::paint(Page* page, PageOverlayList* overlays, WebCanvas* canvas, const WebRect& rect, CanvasBackground background, bool applyDeviceScale)
+void PageWidgetDelegate::paint(Page* page, PageOverlayList* overlays, WebCanvas* canvas, const WebRect& rect, CanvasBackground background)
 {
     if (rect.isEmpty())
@@ -89 +89 @@
     GraphicsContext& gc = builder.context();
     gc.setShouldSmoothFonts(background == Opaque);
-    if (applyDeviceScale) {
-        gc.applyDeviceScaleFactor(page->deviceScaleFactor());
-        gc.platformContext()->setDeviceScaleFactor(page->deviceScaleFactor());
-    }
+    gc.applyDeviceScaleFactor(page->deviceScaleFactor());
+    gc.platformContext()->setDeviceScaleFactor(page->deviceScaleFactor());
     IntRect dirtyRect(rect);
     gc.save();

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

@@ -80 +80 @@
     static void animate(WebCore::Page*, double monotonicFrameBeginTime);
     static void layout(WebCore::Page*);
-    static void paint(WebCore::Page*, PageOverlayList*, WebCanvas*, const WebRect&, CanvasBackground, bool applyDeviceScale);
+    static void paint(WebCore::Page*, PageOverlayList*, WebCanvas*, const WebRect&, CanvasBackground);
     static bool handleInputEvent(WebCore::Page*, PageWidgetEventHandler&, const WebInputEvent&);
 

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

@@ -1363 +1363 @@
     IntPoint unscaledBase = base;
     IntPoint unscaledExtent = extent;
-    if (frame()->page()->settings()->applyPageScaleFactorInCompositor()) {
-        unscaledExtent.scale(1 / view()->pageScaleFactor(), 1 / view()->pageScaleFactor());
-        unscaledBase.scale(1 / view()->pageScaleFactor(), 1 / view()->pageScaleFactor());
-    }
+    unscaledExtent.scale(1 / view()->pageScaleFactor(), 1 / view()->pageScaleFactor());
+    unscaledBase.scale(1 / view()->pageScaleFactor(), 1 / view()->pageScaleFactor());
     VisiblePosition basePosition = visiblePositionForWindowPoint(unscaledBase);
     VisiblePosition extentPosition = visiblePositionForWindowPoint(unscaledExtent);
@@ -1383 +1381 @@
 {
     IntPoint unscaledPoint(point);
-    if (frame()->page()->settings()->applyPageScaleFactorInCompositor())
-        unscaledPoint.scale(1 / view()->pageScaleFactor(), 1 / view()->pageScaleFactor());
+    unscaledPoint.scale(1 / view()->pageScaleFactor(), 1 / view()->pageScaleFactor());
 
     Element* editable = frame()->selection()->rootEditableElement();

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

@@ -262 +262 @@
 {
     if (!m_closing)
-        PageWidgetDelegate::paint(m_page.get(), 0, canvas, rect, PageWidgetDelegate::Opaque, m_webView->settingsImpl()->applyDeviceScaleFactorInCompositor());
+        PageWidgetDelegate::paint(m_page.get(), 0, canvas, rect, PageWidgetDelegate::Opaque);
 }
 

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

@@ -1200 +1200 @@
         // be allowed to manually pinch zoom in further if they desire.
         const float defaultScaleWhenAlreadyLegible = m_minimumPageScaleFactor * doubleTapZoomAlreadyLegibleRatio;
-        float legibleScale = settingsImpl()->applyDeviceScaleFactorInCompositor() ? 1 : deviceScaleFactor();
+        float legibleScale = 1;
 #if ENABLE(TEXT_AUTOSIZING)
         if (page() && page()->settings())
@@ -1210 +1210 @@
         float defaultMargin = doubleTapZoomContentDefaultMargin;
         float minimumMargin = doubleTapZoomContentMinimumMargin;
-        if (!settingsImpl()->applyDeviceScaleFactorInCompositor()) {
-            defaultMargin *= deviceScaleFactor();
-            minimumMargin *= deviceScaleFactor();
-        }
         // We want the margins to have the same physical size, which means we
         // need to express them in post-scale size. To do that we'd need to know
@@ -1224 +1220 @@
                 static_cast<int>(minimumMargin * rect.width / m_size.width));
         // Fit block to screen, respecting limits.
-        if (settingsImpl()->applyPageScaleFactorInCompositor())
-            scale = static_cast<float>(m_size.width) / rect.width;
-        else
-            scale *= static_cast<float>(m_size.width) / rect.width;
+        scale = static_cast<float>(m_size.width) / rect.width;
         scale = min(scale, legibleScale);
         scale = clampPageScaleFactorToLimits(scale);
@@ -1250 +1243 @@
         // though.
 
+        float screenWidth = m_size.width / scale;
         float screenHeight = m_size.height / scale;
-        float screenWidth = m_size.width / scale;
-        if (!settingsImpl()->applyPageScaleFactorInCompositor()) {
-            screenHeight *= pageScaleFactor();
-            screenWidth *= pageScaleFactor();
-        }
 
         // Scroll to vertically align the block.
@@ -1279 +1268 @@
     scale = clampPageScaleFactorToLimits(scale);
     scroll = mainFrameImpl()->frameView()->windowToContents(scroll);
-    if (!settingsImpl()->applyPageScaleFactorInCompositor()) {
-        float scaleDelta = scale / pageScaleFactor();
-        scroll = WebPoint(scroll.x * scaleDelta, scroll.y * scaleDelta);
-    }
     if (!isAnchor)
         scroll = clampOffsetAtScale(scroll, scale);
@@ -1665 +1650 @@
 IntSize WebViewImpl::scaledSize(float pageScaleFactor) const
 {
-    FloatSize scaledSize = dipSize();
+    FloatSize scaledSize = IntSize(m_size);
     scaledSize.scale(1 / pageScaleFactor);
     return expandedIntSize(scaledSize);
@@ -1724 +1709 @@
         float fixedLayoutWidthRatio = !oldFixedLayoutWidth ? 1 : fixedLayoutSize().width / (float) oldFixedLayoutWidth;
         float scaleMultiplier = viewportWidthRatio / fixedLayoutWidthRatio;
-        if (scaleMultiplier != 1) {
-            IntSize scrollOffsetAtNewScale = oldScrollOffset;
-            if (!settingsImpl()->applyPageScaleFactorInCompositor())
-                scrollOffsetAtNewScale.scale(scaleMultiplier);
-            setPageScaleFactor(oldPageScaleFactor * scaleMultiplier, IntPoint(scrollOffsetAtNewScale));
-        }
+        if (scaleMultiplier != 1)
+            setPageScaleFactor(oldPageScaleFactor * scaleMultiplier, WebPoint(oldScrollOffset.width(), oldScrollOffset.height()));
     }
 #endif
@@ -1859 +1840 @@
 void WebViewImpl::enterForceCompositingMode(bool enter)
 {
+    if (page()->settings()->forceCompositingMode() == enter)
+        return;
+
     TRACE_EVENT1("webkit", "WebViewImpl::enterForceCompositingMode", "enter", enter);
     settingsImpl()->setForceCompositingMode(enter);
@@ -1920 +1904 @@
 
         double paintStart = currentTime();
-        PageWidgetDelegate::paint(m_page.get(), pageOverlays(), canvas, rect, isTransparent() ? PageWidgetDelegate::Translucent : PageWidgetDelegate::Opaque, m_webSettings->applyDeviceScaleFactorInCompositor());
+        PageWidgetDelegate::paint(m_page.get(), pageOverlays(), canvas, rect, isTransparent() ? PageWidgetDelegate::Translucent : PageWidgetDelegate::Opaque);
         double paintEnd = currentTime();
         double pixelsPerSec = (rect.width * rect.height) / (paintEnd - paintStart);
@@ -2386 +2370 @@
     IntRect scaledAnchor(frame->view()->contentsToWindow(anchor));
     IntRect scaledFocus(frame->view()->contentsToWindow(focus));
-    if (m_webSettings->applyPageScaleFactorInCompositor()) {
-        scaledAnchor.scale(pageScaleFactor());
-        scaledFocus.scale(pageScaleFactor());
-    }
+    scaledAnchor.scale(pageScaleFactor());
+    scaledFocus.scale(pageScaleFactor());
     anchor = scaledAnchor;
     focus = scaledFocus;
@@ -2793 +2775 @@
     WebRect caret, unusedEnd;
     selectionBounds(caret, unusedEnd);
-    if (settingsImpl()->applyPageScaleFactorInCompositor()) {
-        IntRect unscaledCaret = caret;
-        unscaledCaret.scale(1 / pageScaleFactor());
-        caret = unscaledCaret;
-    }
+    IntRect unscaledCaret = caret;
+    unscaledCaret.scale(1 / pageScaleFactor());
+    caret = unscaledCaret;
 
     // Pick a scale which is reasonably readable. This is the scale at which
     // the caret height will become minReadableCaretHeight (adjusted for dpi
     // and font scale factor).
-    float targetScale = settingsImpl()->applyDeviceScaleFactorInCompositor() ? 1 : deviceScaleFactor();
+    float targetScale = 1;
 #if ENABLE(TEXT_AUTOSIZING)
     if (page() && page()->settings())
         targetScale *= page()->settings()->textAutosizingFontScaleFactor();
 #endif
-    const float caretHeight = settingsImpl()->applyPageScaleFactorInCompositor() ? caret.height : caret.height / pageScaleFactor();
-    newScale = clampPageScaleFactorToLimits(minReadableCaretHeight * targetScale / caretHeight);
+    newScale = clampPageScaleFactorToLimits(minReadableCaretHeight * targetScale / caret.height);
     const float deltaScale = newScale / pageScaleFactor();
 
@@ -2817 +2796 @@
     caretInDocumentCoordinates.move(mainFrame()->scrollOffset());
 
-    int viewWidth = m_size.width;
-    int viewHeight = m_size.height;
-    if (settingsImpl()->applyPageScaleFactorInCompositor()) {
-        viewWidth /= newScale;
-        viewHeight /= newScale;
-    } else {
-        textboxRectInDocumentCoordinates.scale(deltaScale);
-        caretInDocumentCoordinates.scale(deltaScale);
-    }
+    int viewWidth = m_size.width / newScale;
+    int viewHeight = m_size.height / newScale;
 
     if (textboxRectInDocumentCoordinates.width() <= viewWidth) {
@@ -2954 +2926 @@
 {
     IntPoint clampedOffset = offset;
-    if (!m_page->settings()->applyPageScaleFactorInCompositor()) {
-        // This is the scaled content size. We need to convert it to the new scale factor.
-        WebSize contentSize = contentsSize();
-        int docWidthAtNewScale = contentSize.width * scale;
-        int docHeightAtNewScale = contentSize.height * scale;
-        int viewWidth = m_size.width;
-        int viewHeight = m_size.height;
-
-        // Enforce the maximum and minimum scroll positions at the new scale.
-        clampedOffset = clampedOffset.shrunkTo(IntPoint(docWidthAtNewScale - viewWidth, docHeightAtNewScale - viewHeight));
-        clampedOffset.clampNegativeToZero();
-    } else {
-        clampedOffset = clampedOffset.shrunkTo(IntPoint(contentsSize() - scaledSize(scale)));
-        clampedOffset.clampNegativeToZero();
-    }
+    clampedOffset = clampedOffset.shrunkTo(IntPoint(contentsSize() - scaledSize(scale)));
+    clampedOffset.clampNegativeToZero();
 
     return clampedOffset;
@@ -2978 +2937 @@
 
     IntPoint scrollOffset(mainFrame()->scrollOffset().width, mainFrame()->scrollOffset().height);
-    if (!m_page->settings()->applyPageScaleFactorInCompositor()) {
-        float deltaScale = scaleFactor / pageScaleFactor();
-        scrollOffset.scale(deltaScale, deltaScale);
-    }
     scrollOffset = clampOffsetAtScale(scrollOffset, scaleFactor);
 
@@ -3013 +2968 @@
 
     m_pageScaleFactorIsSet = true;
-
-#if USE(ACCELERATED_COMPOSITING)
-    updateLayerTreeViewport();
-#endif
 }
 
@@ -3034 +2985 @@
     page()->setDeviceScaleFactor(scaleFactor);
 
-    if (m_layerTreeView && m_webSettings->applyDeviceScaleFactorInCompositor())
+    if (m_layerTreeView)
         m_layerTreeView->setDeviceScaleFactor(scaleFactor);
 }
@@ -3115 +3066 @@
 IntSize WebViewImpl::contentsSize() const
 {
-    Frame* frame = page()->mainFrame();
-    RenderView* root = frame->contentRenderer();
+    RenderView* root = page()->mainFrame()->contentRenderer();
     if (!root)
         return IntSize();
-
-    // If page scale is not applied by compositor, then the CSS transform will
-    // scale by an arbitrary amount. Return the unscaled contents size in this
-    // case.
-    if (!m_page->settings()->applyPageScaleFactorInCompositor())
-        return root->unscaledDocumentRect().size();
-
     return root->documentRect().size();
 }
@@ -3253 +3196 @@
 
     frame->view()->setFixedLayoutSize(layoutSize);
-}
-
-WebCore::IntSize WebViewImpl::dipSize() const
-{
-    IntSize dipSize = m_size;
-    if (!m_webSettings->applyDeviceScaleFactorInCompositor())
-        dipSize.scale(1 / m_client->screenInfo().deviceScaleFactor);
-    return dipSize;
 }
 
@@ -3824 +3759 @@
 }
 
+void WebViewImpl::deviceOrPageScaleFactorChanged()
+{
+    if (pageScaleFactor() && pageScaleFactor() != 1)
+        enterForceCompositingMode(true);
+#if USE(ACCELERATED_COMPOSITING)
+    updateLayerTreeViewport();
+#endif
+}
+
 bool WebViewImpl::useExternalPopupMenus()
 {
@@ -4143 +4087 @@
         if (m_layerTreeView) {
             m_layerTreeView->setRootLayer(*m_rootLayer);
-            if (m_webSettings->applyDeviceScaleFactorInCompositor() && page()->deviceScaleFactor() != 1)
-                setDeviceScaleFactor(page()->deviceScaleFactor());
 
             bool visible = page()->visibilityState() == PageVisibilityStateVisible;
             m_layerTreeView->setVisible(visible);
+            m_layerTreeView->setDeviceScaleFactor(page()->deviceScaleFactor());
             m_layerTreeView->setPageScaleFactorAndLimits(pageScaleFactor(), m_minimumPageScaleFactor, m_maximumPageScaleFactor);
             m_layerTreeView->setHasTransparentBackground(isTransparent());
@@ -4213 +4156 @@
 
         WebPoint scrollPoint(scrollOffset.width, scrollOffset.height);
-        if (!m_page->settings()->applyPageScaleFactorInCompositor()) {
-            // The old scroll offset (and passed-in delta) are in the old
-            // coordinate space, so we first need to multiply them by the page
-            // scale delta.
-            scrollPoint.x = scrollPoint.x * pageScaleDelta;
-            scrollPoint.y = scrollPoint.y * pageScaleDelta;
-        }
-
         setPageScaleFactor(pageScaleFactor() * pageScaleDelta, scrollPoint);
         m_doubleTapZoomPending = false;

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

@@ -420 +420 @@
 
     void didChangeContentsSize();
+    void deviceOrPageScaleFactorChanged();
 
     // Returns true if popup menus should be rendered by the browser, false if
@@ -445 +446 @@
     }
 
-    WebCore::IntSize dipSize() const;
     WebCore::IntSize scaledSize(float) const;
 

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

@@ -84 +84 @@
     webView->settings()->setJavaScriptEnabled(enableJavascript);
     webView->settings()->setDeviceSupportsMouse(false);
+    webView->settings()->setApplyPageScaleFactorInCompositor(true);
+    webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
+    webView->settings()->setForceCompositingMode(true);
     webView->initializeMainFrame(webFrameClient);
 

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

@@ -265 +265 @@
     // only becomes available after the load begins.
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->enableFixedLayoutMode(true);
     m_webView->settings()->setViewportEnabled(true);
@@ -295 +293 @@
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "no_viewport_tag.html", true, 0, &client);
 
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->settings()->setViewportEnabled(true);
     m_webView->enableFixedLayoutMode(true);
@@ -326 +322 @@
     // only becomes available after the load begins.
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->enableFixedLayoutMode(true);
     m_webView->settings()->setViewportEnabled(true);
@@ -363 +357 @@
 
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client);
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->enableFixedLayoutMode(true);
     m_webView->settings()->setViewportEnabled(true);
@@ -384 +376 @@
 
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-2x-initial-scale.html", true, 0, &client);
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->enableFixedLayoutMode(true);
     m_webView->settings()->setViewportEnabled(true);
@@ -404 +394 @@
 
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->setInitialPageScaleOverride(enforcedPageScalePactor);
 
@@ -441 +429 @@
 
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client);
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->enableFixedLayoutMode(true);
     m_webView->settings()->setViewportEnabled(true);
@@ -463 +449 @@
 
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-2x-initial-scale.html", true, 0, &client);
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->enableFixedLayoutMode(true);
     m_webView->settings()->setViewportEnabled(true);
@@ -499 +483 @@
 
     m_webView = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client));
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->enableFixedLayoutMode(true);
     m_webView->settings()->setViewportEnabled(true);
@@ -523 +505 @@
 
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->enableFixedLayoutMode(true);
     m_webView->settings()->setViewportEnabled(true);
@@ -548 +528 @@
 
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->enableFixedLayoutMode(true);
     m_webView->settings()->setViewportEnabled(true);
@@ -584 +562 @@
 
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->enableFixedLayoutMode(true);
     m_webView->settings()->setViewportEnabled(true);
@@ -610 +586 @@
 
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->enableFixedLayoutMode(true);
     m_webView->settings()->setViewportEnabled(true);
@@ -653 +627 @@
 
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "no_scale_for_you.html", true, 0, &client);
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->enableFixedLayoutMode(true);
     m_webView->settings()->setViewportEnabled(true);
@@ -682 +654 @@
     int viewportHeight = 1280 / deviceScaleFactor;
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "get_scale_for_auto_zoom_into_div_test.html"); //
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->setDeviceScaleFactor(deviceScaleFactor);
     m_webView->setPageScaleFactorLimits(0.01f, 4);
@@ -751 +721 @@
     float doubleTapZoomAlreadyLegibleRatio = 1.2f;
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "get_multiple_divs_for_auto_zoom_test.html");
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->enableFixedLayoutMode(true);
     m_webView->resize(WebSize(viewportWidth, viewportHeight));
@@ -802 +770 @@
     float doubleTapZoomAlreadyLegibleRatio = 1.2f;
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html");
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->enableFixedLayoutMode(true);
     m_webView->resize(WebSize(viewportWidth, viewportHeight));
@@ -868 +834 @@
     float textAutosizingFontScaleFactor = 1.13f;
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html");
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->enableFixedLayoutMode(true);
     m_webView->resize(WebSize(viewportWidth, viewportHeight));
@@ -950 +914 @@
     float minReadableCaretHeight = 18.0f;
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "get_scale_for_zoom_into_editable_test.html");
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->enableFixedLayoutMode(true);
     m_webView->resize(WebSize(viewportWidth, viewportHeight));
@@ -2074 +2036 @@
     // only becomes available after the load begins.
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + htmlFile, true, 0, &client);
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->resize(WebSize(1000, 1000));
     m_webView->layout();
@@ -2123 +2083 @@
     // only becomes available after the load begins.
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "disambiguation_popup_no_container.html", true, 0, &client);
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->resize(WebSize(1000, 1000));
     m_webView->layout();
@@ -2146 +2104 @@
     // only becomes available after the load begins.
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + htmlFile, true, 0, &client);
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->resize(WebSize(1000, 1000));
     m_webView->layout();
@@ -2188 +2144 @@
     // only becomes available after the load begins.
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + htmlFile, true, 0, &client);
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->resize(WebSize(viewportWidth, viewportHeight));
     m_webView->layout();
@@ -2221 +2175 @@
     // only becomes available after the load begins.
     m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "disambiguation_popup_page_scale.html", true, 0, &client);
-    m_webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    m_webView->settings()->setApplyPageScaleFactorInCompositor(true);
     m_webView->resize(WebSize(1000, 1000));
     m_webView->layout();

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

@@ -98 +98 @@
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_str()), WebString::fromUTF8("fixed_layout.html"));
     WebViewImpl* webViewImpl = static_cast<WebViewImpl*>(FrameTestHelpers::createWebViewAndLoad(baseURL + fileName, true));
-    webViewImpl->settings()->setApplyDeviceScaleFactorInCompositor(true);
-    webViewImpl->settings()->setApplyPageScaleFactorInCompositor(true);
     webViewImpl->enableFixedLayoutMode(true);
     webViewImpl->settings()->setViewportEnabled(true);

trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebPreferences.cpp

@@ -215 +215 @@
     settings->setPasswordEchoEnabled(false);
     settings->setApplyDeviceScaleFactorInCompositor(true);
+    settings->setApplyPageScaleFactorInCompositor(true);
     settings->setSmartInsertDeleteEnabled(true);
 #ifdef WIN32