Title: [240140] trunk/Source/WebCore
Revision
240140
Author
[email protected]
Date
2019-01-18 00:07:02 -0800 (Fri, 18 Jan 2019)

Log Message

ScrollingCoordinator::scrollableAreaScrollLayerDidChange() can be removed
https://bugs.webkit.org/show_bug.cgi?id=193559

Reviewed by Antti Koivisto.

ScrollingCoordinator::scrollableAreaScrollLayerDidChange() existed for CoordinatedGraphics,
but the code that used it was removed in webkit.org/r229318 so we can remove it and
code that calls it.

* page/scrolling/ScrollingCoordinator.h:
(WebCore::ScrollingCoordinator::willDestroyScrollableArea):
(WebCore::ScrollingCoordinator::scrollableAreaScrollLayerDidChange): Deleted.
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateGeometry):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::willRemoveScrollingLayerWithBacking):
(WebCore::RenderLayerCompositor::didAddScrollingLayer):
(WebCore::RenderLayerCompositor::scrollingLayerDidChange): Deleted.
* rendering/RenderLayerCompositor.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (240139 => 240140)


--- trunk/Source/WebCore/ChangeLog	2019-01-18 04:15:24 UTC (rev 240139)
+++ trunk/Source/WebCore/ChangeLog	2019-01-18 08:07:02 UTC (rev 240140)
@@ -1,3 +1,25 @@
+2019-01-18  Simon Fraser  <[email protected]>
+
+        ScrollingCoordinator::scrollableAreaScrollLayerDidChange() can be removed
+        https://bugs.webkit.org/show_bug.cgi?id=193559
+
+        Reviewed by Antti Koivisto.
+
+        ScrollingCoordinator::scrollableAreaScrollLayerDidChange() existed for CoordinatedGraphics,
+        but the code that used it was removed in webkit.org/r229318 so we can remove it and
+        code that calls it.
+
+        * page/scrolling/ScrollingCoordinator.h:
+        (WebCore::ScrollingCoordinator::willDestroyScrollableArea):
+        (WebCore::ScrollingCoordinator::scrollableAreaScrollLayerDidChange): Deleted.
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateGeometry):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::willRemoveScrollingLayerWithBacking):
+        (WebCore::RenderLayerCompositor::didAddScrollingLayer):
+        (WebCore::RenderLayerCompositor::scrollingLayerDidChange): Deleted.
+        * rendering/RenderLayerCompositor.h:
+
 2019-01-17  Wenson Hsieh  <[email protected]>
 
         [iOS] Content offset jumps erratically when autoscrolling near scroll view content inset areas

Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h (240139 => 240140)


--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h	2019-01-18 04:15:24 UTC (rev 240139)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h	2019-01-18 08:07:02 UTC (rev 240140)
@@ -216,7 +216,6 @@
     bool shouldUpdateScrollLayerPositionSynchronously(const FrameView&) const;
 
     virtual void willDestroyScrollableArea(ScrollableArea&) { }
-    virtual void scrollableAreaScrollLayerDidChange(ScrollableArea&) { }
     virtual void scrollableAreaScrollbarLayerDidChange(ScrollableArea&, ScrollbarOrientation) { }
 
     static String synchronousScrollingReasonsAsText(SynchronousScrollingReasons);

Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (240139 => 240140)


--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp	2019-01-18 04:15:24 UTC (rev 240139)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp	2019-01-18 08:07:02 UTC (rev 240140)
@@ -1226,9 +1226,6 @@
         if (scrollSize != m_scrollingContentsLayer->size() || paddingBoxOffsetChanged)
             m_scrollingContentsLayer->setNeedsDisplay();
 
-        if (toLayoutSize(paddingBox.location()) != m_scrollingContentsLayer->offsetFromRenderer() || scrollOffset != m_scrollingContentsLayer->scrollOffset() || scrollSize != m_scrollingContentsLayer->size())
-            compositor().scrollingLayerDidChange(m_owningLayer);
-
         m_scrollingContentsLayer->setSize(scrollSize);
         m_scrollingContentsLayer->setScrollOffset(scrollOffset, GraphicsLayer::DontSetNeedsDisplay);
         m_scrollingContentsLayer->setOffsetFromRenderer(toLayoutSize(paddingBox.location()), GraphicsLayer::DontSetNeedsDisplay);

Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (240139 => 240140)


--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp	2019-01-18 04:15:24 UTC (rev 240139)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp	2019-01-18 08:07:02 UTC (rev 240140)
@@ -1867,12 +1867,6 @@
     }
 }
 
-void RenderLayerCompositor::scrollingLayerDidChange(RenderLayer& layer)
-{
-    if (auto* scrollingCoordinator = this->scrollingCoordinator())
-        scrollingCoordinator->scrollableAreaScrollLayerDidChange(layer);
-}
-
 void RenderLayerCompositor::fixedRootBackgroundLayerChanged()
 {
     if (m_renderView.renderTreeBeingDestroyed())
@@ -3990,11 +3984,8 @@
 
 void RenderLayerCompositor::willRemoveScrollingLayerWithBacking(RenderLayer& layer, RenderLayerBacking& backing)
 {
-    if (auto* scrollingCoordinator = this->scrollingCoordinator()) {
+    if (scrollingCoordinator()) {
         backing.detachFromScrollingCoordinator(ScrollCoordinationRole::Scrolling);
-
-        // For Coordinated Graphics.
-        scrollingCoordinator->scrollableAreaScrollLayerDidChange(layer);
         return;
     }
 
@@ -4002,6 +3993,8 @@
     ASSERT(m_renderView.document().pageCacheState() == Document::NotInPageCache);
     if (m_legacyScrollingLayerCoordinator)
         m_legacyScrollingLayerCoordinator->removeScrollingLayer(layer, backing);
+#else
+    UNUSED_PARAM(layer);
 #endif
 }
 
@@ -4008,12 +4001,8 @@
 void RenderLayerCompositor::didAddScrollingLayer(RenderLayer& layer)
 {
     updateScrollCoordinatedStatus(layer, { ScrollingNodeChangeFlags::Layer, ScrollingNodeChangeFlags::LayerGeometry });
-
-    if (auto* scrollingCoordinator = this->scrollingCoordinator()) {
-        // For Coordinated Graphics.
-        scrollingCoordinator->scrollableAreaScrollLayerDidChange(layer);
+    if (scrollingCoordinator())
         return;
-    }
 
 #if PLATFORM(IOS_FAMILY)
     ASSERT(m_renderView.document().pageCacheState() == Document::NotInPageCache);

Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (240139 => 240140)


--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h	2019-01-18 04:15:24 UTC (rev 240139)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h	2019-01-18 08:07:02 UTC (rev 240140)
@@ -280,7 +280,6 @@
     void frameViewDidLayout();
     void rootLayerConfigurationChanged();
 
-    void scrollingLayerDidChange(RenderLayer&);
     void fixedRootBackgroundLayerChanged();
 
     String layerTreeAsText(LayerTreeFlags);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to