Changeset 167969 in webkit

Timestamp:

Apr 29, 2014, 4:53:55 PM (12 years ago)

Author:

Simon Fraser

Message:

Remove Settings::compositedScrollingForFramesEnabled
​https://bugs.webkit.org/show_bug.cgi?id=132352

Reviewed by Andreas Kling.

Source/WebCore:
The usesCompositedScrolling setting was only used by Chromium, so
remove it and associated code.

• page/FrameView.cpp:

(WebCore::FrameView::usesCompositedScrolling): Deleted.

• page/FrameView.h:
• page/Settings.in:
• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::updateScrollLayerPosition):

LayoutTests:

• compositing/iframes/iframe-composited-scrolling-expected.txt: Removed.
• compositing/iframes/iframe-composited-scrolling.html: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/iframes/iframe-composited-scrolling-expected.txt (deleted)
• LayoutTests/compositing/iframes/iframe-composited-scrolling.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/FrameView.cpp (modified) (1 diff)
• Source/WebCore/page/FrameView.h (modified) (1 diff)
• Source/WebCore/page/Settings.in (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerCompositor.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-04-29  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove Settings::compositedScrollingForFramesEnabled
+        https://bugs.webkit.org/show_bug.cgi?id=132352
+
+        Reviewed by Andreas Kling.
+
+        * compositing/iframes/iframe-composited-scrolling-expected.txt: Removed.
+        * compositing/iframes/iframe-composited-scrolling.html: Removed.
+
 2014-04-29  David Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-29  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove Settings::compositedScrollingForFramesEnabled
+        https://bugs.webkit.org/show_bug.cgi?id=132352
+
+        Reviewed by Andreas Kling.
+
+        The usesCompositedScrolling setting was only used by Chromium, so
+        remove it and associated code.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::usesCompositedScrolling): Deleted.
+        * page/FrameView.h:
+        * page/Settings.in:
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::updateScrollLayerPosition):
+
 2014-04-29  Zsolt Borbely  <zsborbely.u-szeged@partner.samsung.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -753 +753 @@
 }
 
-bool FrameView::usesCompositedScrolling() const
-{
-    RenderView* renderView = this->renderView();
-    if (!renderView)
-        return false;
-    if (frame().settings().compositedScrollingForFramesEnabled())
-        return renderView->compositor().inForcedCompositingMode();
-    return false;
-}
-
 GraphicsLayer* FrameView::layerForScrolling() const
 {

trunk/Source/WebCore/page/FrameView.h

@@ -556 +556 @@
     virtual IntRect scrollableAreaBoundingBox() const override;
     virtual bool scrollAnimatorEnabled() const override;
-    virtual bool usesCompositedScrolling() const override;
     virtual GraphicsLayer* layerForScrolling() const override;
     virtual GraphicsLayer* layerForHorizontalScrollbar() const override;

trunk/Source/WebCore/page/Settings.in

@@ -98 +98 @@
 acceleratedCompositingForOverflowScrollEnabled initial=false
 
-# Works only in conjunction with forceCompositingMode.
-compositedScrollingForFramesEnabled initial=false
-
 experimentalNotificationsEnabled initial=false
 webGLEnabled initial=false

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -1573 +1573 @@
     IntPoint scrollPosition = frameView.scrollPosition();
 
-    const Settings& settings = m_renderView.frameView().frame().settings();
-    if (settings.compositedScrollingForFramesEnabled()) {
-        if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
-            scrollingCoordinator->scrollableAreaScrollLayerDidChange(&frameView);
-    }
-
     m_scrollLayer->setPosition(FloatPoint(-scrollPosition.x(), -scrollPosition.y()));