Attachment 359431 Details for Bug 193559 – Patch

[patch] Patch

bug-193559-20190117173228.patch (text/plain), 5.96 KB, created by Simon Fraser (smfr) on 2019-01-17 17:32:28 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2019-01-17 17:32:28 PST

Size: 5.96 KB

patch

obsolete

>Subversion Revision: 240114
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index b58a862f6b2e77ac10dac93ca371351f3e006bca..171f673eb7bc5c3ca950e9bc76e9af0e14ca3426 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,25 @@
>+2019-01-17  Simon Fraser  <simon.fraser@apple.com>
>+
>+        ScrollingCoordinator::scrollableAreaScrollLayerDidChange() can be removed
>+        https://bugs.webkit.org/show_bug.cgi?id=193559
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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  Jon Lee  <jonlee@apple.com>
> 
>         [EME] Remove Amazon Prime Video from quirks list
>diff --git a/Source/WebCore/page/scrolling/ScrollingCoordinator.h b/Source/WebCore/page/scrolling/ScrollingCoordinator.h
>index 7ca1bb5bca50b9147e9ef9b00ccde429b7b66839..a9b12cca90e04af3dad4300d236e914e15754ae6 100644
>--- a/Source/WebCore/page/scrolling/ScrollingCoordinator.h
>+++ b/Source/WebCore/page/scrolling/ScrollingCoordinator.h
>@@ -216,7 +216,6 @@ public:
>     bool shouldUpdateScrollLayerPositionSynchronously(const FrameView&) const;
> 
>     virtual void willDestroyScrollableArea(ScrollableArea&) { }
>-    virtual void scrollableAreaScrollLayerDidChange(ScrollableArea&) { }
>     virtual void scrollableAreaScrollbarLayerDidChange(ScrollableArea&, ScrollbarOrientation) { }
> 
>     static String synchronousScrollingReasonsAsText(SynchronousScrollingReasons);
>diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp
>index b64f8f769012d716896d6cba4bb5c693648a1850..99afd882b7f282d3df62b618ccefb839fff73be9 100644
>--- a/Source/WebCore/rendering/RenderLayerBacking.cpp
>+++ b/Source/WebCore/rendering/RenderLayerBacking.cpp
>@@ -1226,9 +1226,6 @@ void RenderLayerBacking::updateGeometry()
>         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);
>diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp
>index c674287efd9cdf75c0f163245634aa87cde52ef6..2222d547b133b92280b1f78e4312c60614e8a3a5 100644
>--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp
>+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp
>@@ -1867,12 +1867,6 @@ void RenderLayerCompositor::rootLayerConfigurationChanged()
>     }
> }
> 
>-void RenderLayerCompositor::scrollingLayerDidChange(RenderLayer& layer)
>-{
>-    if (auto* scrollingCoordinator = this->scrollingCoordinator())
>-        scrollingCoordinator->scrollableAreaScrollLayerDidChange(layer);
>-}
>-
> void RenderLayerCompositor::fixedRootBackgroundLayerChanged()
> {
>     if (m_renderView.renderTreeBeingDestroyed())
>@@ -3990,11 +3984,8 @@ ScrollableArea* RenderLayerCompositor::scrollableAreaForScrollLayerID(ScrollingN
> 
> 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,18 +3993,16 @@ void RenderLayerCompositor::willRemoveScrollingLayerWithBacking(RenderLayer& lay
>     ASSERT(m_renderView.document().pageCacheState() == Document::NotInPageCache);
>     if (m_legacyScrollingLayerCoordinator)
>         m_legacyScrollingLayerCoordinator->removeScrollingLayer(layer, backing);
>+#else
>+    UNUSED_PARAM(layer);
> #endif
> }
> 
> 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);
>diff --git a/Source/WebCore/rendering/RenderLayerCompositor.h b/Source/WebCore/rendering/RenderLayerCompositor.h
>index e4b76747ad8cd701748f9caa5ddc20528c885420..051ff09356f0b0f1c504f4fc51bb8dc00a841d30 100644
>--- a/Source/WebCore/rendering/RenderLayerCompositor.h
>+++ b/Source/WebCore/rendering/RenderLayerCompositor.h
>@@ -280,7 +280,6 @@ public:
>     void frameViewDidLayout();
>     void rootLayerConfigurationChanged();
> 
>-    void scrollingLayerDidChange(RenderLayer&);
>     void fixedRootBackgroundLayerChanged();
> 
>     String layerTreeAsText(LayerTreeFlags);

Actions: View | Formatted Diff | Diff

Attachments on bug 193559: 359431