git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 78cb5da)
Remove Settings::compositedScrollingForFramesEnabled
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 29 Apr 2014 23:53:55 +0000 (23:53 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 29 Apr 2014 23:53:55 +0000 (23:53 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@167969 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog patch | blob | history
LayoutTests/compositing/iframes/iframe-composited-scrolling-expected.txt [deleted file] patch | blob | history
LayoutTests/compositing/iframes/iframe-composited-scrolling.html [deleted file] patch | blob | history
Source/WebCore/ChangeLog patch | blob | history
Source/WebCore/page/FrameView.cpp patch | blob | history
Source/WebCore/page/FrameView.h patch | blob | history
Source/WebCore/page/Settings.in patch | blob | history
Source/WebCore/rendering/RenderLayerCompositor.cpp patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6bbe0ff..0672c94 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+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>
 
         [New Multicolumn] Implement support for compositing
diff --git a/LayoutTests/compositing/iframes/iframe-composited-scrolling-expected.txt b/LayoutTests/compositing/iframes/iframe-composited-scrolling-expected.txt
deleted file mode 100644 (file)
index 3be5dec..0000000
--- a/LayoutTests/compositing/iframes/iframe-composited-scrolling-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
- 
-PASS
diff --git a/LayoutTests/compositing/iframes/iframe-composited-scrolling.html b/LayoutTests/compositing/iframes/iframe-composited-scrolling.html
deleted file mode 100644 (file)
index f0f5a98..0000000
--- a/LayoutTests/compositing/iframes/iframe-composited-scrolling.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <style>
-    iframe {
-      height: 150px;
-      width: 150px;
-    }
-  </style>
-  <script>
-    if (window.internals) {
-      internals.settings.setForceCompositingMode(true);
-      internals.settings.setCompositedScrollingForFramesEnabled(true);
-    }
-    function doTest()
-    {
-      if (window.testRunner) {
-        testRunner.dumpAsText(false);
-        if (window.internals)
-          document.getElementById("result").innerText = window.internals.nonFastScrollableRects().length ? "FAIL" : "PASS";
-      }
-    }
-    window.addEventListener("load", doTest, false);
-  </script>
-</head>
-<body>
-  <iframe id="scrollable-iframe" src="resources/subframe.html" style="width: 100px; height: 100px"></iframe>
-  <iframe id="non-scrollable-iframe" src="resources/subframe.html" style="width: 2000px; height: 2000px"></iframe>
-  <pre id="result"></pre>
-</body>
-</html>
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 6265abb..c46726e 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+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>
 
         Move removeEquivalentProperties functions to EditingStyle
diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
index 12a7c57..36d9987 100644 (file)
--- a/Source/WebCore/page/FrameView.cpp
+++ b/Source/WebCore/page/FrameView.cpp
@@ -752,16 +752,6 @@ void FrameView::restoreBackingStores()
     compositor.updateCompositingLayers(CompositingUpdateAfterLayout);
 }
 
-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
 {
     RenderView* renderView = this->renderView();
diff --git a/Source/WebCore/page/FrameView.h b/Source/WebCore/page/FrameView.h
index a01dd16..ea2983b 100644 (file)
--- a/Source/WebCore/page/FrameView.h
+++ b/Source/WebCore/page/FrameView.h
@@ -555,7 +555,6 @@ private:
     virtual ScrollableArea* enclosingScrollableArea() const override;
     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;
     virtual GraphicsLayer* layerForVerticalScrollbar() const override;
diff --git a/Source/WebCore/page/Settings.in b/Source/WebCore/page/Settings.in
index 9a9441a..8427193 100644 (file)
--- a/Source/WebCore/page/Settings.in
+++ b/Source/WebCore/page/Settings.in
@@ -97,9 +97,6 @@ unsafePluginPastingEnabled initial=true
 acceleratedCompositingForFixedPositionEnabled initial=defaultAcceleratedCompositingForFixedPositionEnabled
 acceleratedCompositingForOverflowScrollEnabled initial=false
 
-# Works only in conjunction with forceCompositingMode.
-compositedScrollingForFramesEnabled initial=false
-
 experimentalNotificationsEnabled initial=false
 webGLEnabled initial=false
 webGLErrorsToConsoleEnabled initial=true
diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp
index 5572c0b..0a6f902 100644 (file)
--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp
@@ -1572,12 +1572,6 @@ void RenderLayerCompositor::updateScrollLayerPosition()
     FrameView& frameView = m_renderView.frameView();
     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()));
 
     if (GraphicsLayer* fixedBackgroundLayer = fixedRootBackgroundLayer())
Mirror of the WebKit open source project from svn.webkit.org.