Title: [167969] trunk
- Revision
- 167969
- Author
- simon.fra...@apple.com
- Date
- 2014-04-29 16:53:55 -0700 (Tue, 29 Apr 2014)
Log 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.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (167968 => 167969)
--- trunk/LayoutTests/ChangeLog 2014-04-29 23:40:49 UTC (rev 167968)
+++ trunk/LayoutTests/ChangeLog 2014-04-29 23:53:55 UTC (rev 167969)
@@ -1,3 +1,13 @@
+2014-04-29 Simon Fraser <simon.fra...@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 <hy...@apple.com>
[New Multicolumn] Implement support for compositing
Deleted: trunk/LayoutTests/compositing/iframes/iframe-composited-scrolling-expected.txt (167968 => 167969)
--- trunk/LayoutTests/compositing/iframes/iframe-composited-scrolling-expected.txt 2014-04-29 23:40:49 UTC (rev 167968)
+++ trunk/LayoutTests/compositing/iframes/iframe-composited-scrolling-expected.txt 2014-04-29 23:53:55 UTC (rev 167969)
@@ -1,2 +0,0 @@
-
-PASS
Deleted: trunk/LayoutTests/compositing/iframes/iframe-composited-scrolling.html (167968 => 167969)
--- trunk/LayoutTests/compositing/iframes/iframe-composited-scrolling.html 2014-04-29 23:40:49 UTC (rev 167968)
+++ trunk/LayoutTests/compositing/iframes/iframe-composited-scrolling.html 2014-04-29 23:53:55 UTC (rev 167969)
@@ -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="" style="width: 100px; height: 100px"></iframe>
- <iframe id="non-scrollable-iframe" src="" style="width: 2000px; height: 2000px"></iframe>
- <pre id="result"></pre>
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (167968 => 167969)
--- trunk/Source/WebCore/ChangeLog 2014-04-29 23:40:49 UTC (rev 167968)
+++ trunk/Source/WebCore/ChangeLog 2014-04-29 23:53:55 UTC (rev 167969)
@@ -1,3 +1,20 @@
+2014-04-29 Simon Fraser <simon.fra...@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-sze...@partner.samsung.com>
Move removeEquivalentProperties functions to EditingStyle
Modified: trunk/Source/WebCore/page/FrameView.cpp (167968 => 167969)
--- trunk/Source/WebCore/page/FrameView.cpp 2014-04-29 23:40:49 UTC (rev 167968)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-04-29 23:53:55 UTC (rev 167969)
@@ -752,16 +752,6 @@
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();
Modified: trunk/Source/WebCore/page/FrameView.h (167968 => 167969)
--- trunk/Source/WebCore/page/FrameView.h 2014-04-29 23:40:49 UTC (rev 167968)
+++ trunk/Source/WebCore/page/FrameView.h 2014-04-29 23:53:55 UTC (rev 167969)
@@ -555,7 +555,6 @@
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;
Modified: trunk/Source/WebCore/page/Settings.in (167968 => 167969)
--- trunk/Source/WebCore/page/Settings.in 2014-04-29 23:40:49 UTC (rev 167968)
+++ trunk/Source/WebCore/page/Settings.in 2014-04-29 23:53:55 UTC (rev 167969)
@@ -97,9 +97,6 @@
acceleratedCompositingForFixedPositionEnabled initial=defaultAcceleratedCompositingForFixedPositionEnabled
acceleratedCompositingForOverflowScrollEnabled initial=false
-# Works only in conjunction with forceCompositingMode.
-compositedScrollingForFramesEnabled initial=false
-
experimentalNotificationsEnabled initial=false
webGLEnabled initial=false
webGLErrorsToConsoleEnabled initial=true
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (167968 => 167969)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-04-29 23:40:49 UTC (rev 167968)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-04-29 23:53:55 UTC (rev 167969)
@@ -1572,12 +1572,6 @@
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())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
