Attachment 360927 Details for Bug 194180 – Patch

[patch] Patch

bug-194180-20190201172753.patch (text/plain), 6.13 KB, created by Simon Fraser (smfr) on 2019-02-01 17:27:54 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2019-02-01 17:27:54 PST

Size: 6.13 KB

patch

obsolete

>Subversion Revision: 240885
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 7b8dc4ce5086afbfd26acaaceff92a35d3e0fb66..7586daa8319b34a74b3d0833b10b5af239c2c63c 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,24 @@
>+2019-02-01  Simon Fraser  <simon.fraser@apple.com>
>+
>+        Remove the unused layerForScrolling()
>+        https://bugs.webkit.org/show_bug.cgi?id=194180
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove ScrollableArea::layerForScrolling() and derivations. This was unused.
>+
>+        * page/FrameView.cpp:
>+        (WebCore::FrameView::layerForScrolling const): Deleted.
>+        * page/FrameView.h:
>+        * page/scrolling/ScrollingCoordinator.cpp:
>+        (WebCore::ScrollingCoordinator::scrollLayerForScrollableArea): Deleted.
>+        * page/scrolling/ScrollingCoordinator.h:
>+        * platform/ScrollableArea.h:
>+        (WebCore::ScrollableArea::layerForScrolling const): Deleted.
>+        * rendering/RenderLayer.cpp:
>+        (WebCore::RenderLayer::calculateClipRects const):
>+        * rendering/RenderLayer.h:
>+
> 2019-02-01  Chris Dumez  <cdumez@apple.com>
> 
>         REGRESSION: Flaky ASSERTION FAILED: m_uncommittedState.state == State::Committed on http/tests/cookies/same-site/fetch-after-top-level-navigation-initiated-from-iframe-in-cross-origin-page.html
>diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
>index b56b4eb96f8ec7ca12f35049382dcfbaced2699f..5e619d52a36fa63eb40ff81ddba31b45544d1ded 100644
>--- a/Source/WebCore/page/FrameView.cpp
>+++ b/Source/WebCore/page/FrameView.cpp
>@@ -848,14 +848,6 @@ void FrameView::updateCompositingLayersAfterLayout()
>     renderView->compositor().updateCompositingLayers(CompositingUpdateType::AfterLayout);
> }
> 
>-GraphicsLayer* FrameView::layerForScrolling() const
>-{
>-    RenderView* renderView = this->renderView();
>-    if (!renderView)
>-        return nullptr;
>-    return renderView->compositor().scrollLayer();
>-}
>-
> GraphicsLayer* FrameView::layerForHorizontalScrollbar() const
> {
>     RenderView* renderView = this->renderView();
>diff --git a/Source/WebCore/page/FrameView.h b/Source/WebCore/page/FrameView.h
>index 349346ca521f1b27cc73d1771c915b76641a621c..636ecb92f92ba4346011aa678f8400eb76375584 100644
>--- a/Source/WebCore/page/FrameView.h
>+++ b/Source/WebCore/page/FrameView.h
>@@ -729,7 +729,6 @@ private:
>     ScrollableArea* enclosingScrollableArea() const final;
>     IntRect scrollableAreaBoundingBox(bool* = nullptr) const final;
>     bool scrollAnimatorEnabled() const final;
>-    GraphicsLayer* layerForScrolling() const final;
>     GraphicsLayer* layerForScrollCorner() const final;
> #if ENABLE(RUBBER_BANDING)
>     GraphicsLayer* layerForOverhangAreas() const final;
>diff --git a/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp b/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
>index a39f3c99b806b62659fde357e379ab8161e2d135..c29d080e69c44baa0fdd870c95bbab991726d9f5 100644
>--- a/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
>@@ -224,11 +224,6 @@ void ScrollingCoordinator::frameViewFixedObjectsDidChange(FrameView& frameView)
>     updateSynchronousScrollingReasons(frameView);
> }
> 
>-GraphicsLayer* ScrollingCoordinator::scrollLayerForScrollableArea(ScrollableArea& scrollableArea)
>-{
>-    return scrollableArea.layerForScrolling();
>-}
>-
> GraphicsLayer* ScrollingCoordinator::scrollLayerForFrameView(FrameView& frameView)
> {
>     if (auto* renderView = frameView.frame().contentRenderer())
>diff --git a/Source/WebCore/page/scrolling/ScrollingCoordinator.h b/Source/WebCore/page/scrolling/ScrollingCoordinator.h
>index e16c2af5cf7e1d7886950f312394a82d8f740a85..d1b33308c91b39770d494fc17eaa9073ee186640 100644
>--- a/Source/WebCore/page/scrolling/ScrollingCoordinator.h
>+++ b/Source/WebCore/page/scrolling/ScrollingCoordinator.h
>@@ -192,8 +192,6 @@ public:
> protected:
>     explicit ScrollingCoordinator(Page*);
> 
>-    static GraphicsLayer* scrollLayerForScrollableArea(ScrollableArea&);
>-
>     GraphicsLayer* scrollLayerForFrameView(FrameView&);
>     GraphicsLayer* counterScrollingLayerForFrameView(FrameView&);
>     GraphicsLayer* insetClipLayerForFrameView(FrameView&);
>diff --git a/Source/WebCore/platform/ScrollableArea.h b/Source/WebCore/platform/ScrollableArea.h
>index e311ae90c69eb2e703067ad1fcd2a07e04302612..01b64e99efc86e211ad31e151f1577a4b9882512 100644
>--- a/Source/WebCore/platform/ScrollableArea.h
>+++ b/Source/WebCore/platform/ScrollableArea.h
>@@ -333,7 +333,6 @@ protected:
>     virtual void invalidateScrollCornerRect(const IntRect&) = 0;
> 
>     friend class ScrollingCoordinator;
>-    virtual GraphicsLayer* layerForScrolling() const { return nullptr; }
>     virtual GraphicsLayer* layerForScrollCorner() const { return nullptr; }
> #if ENABLE(RUBBER_BANDING)
>     virtual GraphicsLayer* layerForOverhangAreas() const { return nullptr; }
>diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp
>index 224bd9994bf88c80f6c91d48a4e68b7e77cd8d1b..0a7080a37d1eb9acb2a36ed4c201e49dad421dc8 100644
>--- a/Source/WebCore/rendering/RenderLayer.cpp
>+++ b/Source/WebCore/rendering/RenderLayer.cpp
>@@ -5931,11 +5931,6 @@ bool RenderLayer::hasCompositedMask() const
>     return m_backing && m_backing->hasMaskLayer();
> }
> 
>-GraphicsLayer* RenderLayer::layerForScrolling() const
>-{
>-    return m_backing ? m_backing->scrollingContentsLayer() : nullptr;
>-}
>-
> GraphicsLayer* RenderLayer::layerForHorizontalScrollbar() const
> {
>     return m_backing ? m_backing->layerForHorizontalScrollbar() : nullptr;
>diff --git a/Source/WebCore/rendering/RenderLayer.h b/Source/WebCore/rendering/RenderLayer.h
>index 63e1fd22153df7a793da4d3bb8caa730c523502f..ff911b5c2654063e7bad8fbe6d817d2d7eee7ecb 100644
>--- a/Source/WebCore/rendering/RenderLayer.h
>+++ b/Source/WebCore/rendering/RenderLayer.h
>@@ -799,7 +799,6 @@ public:
>     RenderLayerBacking* ensureBacking();
>     void clearBacking(bool layerBeingDestroyed = false);
> 
>-    GraphicsLayer* layerForScrolling() const override;
>     GraphicsLayer* layerForHorizontalScrollbar() const override;
>     GraphicsLayer* layerForVerticalScrollbar() const override;
>     GraphicsLayer* layerForScrollCorner() const override;

Actions: View | Formatted Diff | Diff

Attachments on bug 194180: 360927