Changeset 260788 in webkit


Ignore:
Timestamp:
Apr 27, 2020 2:57:50 PM (4 years ago)
Author:
Simon Fraser
Message:

Rename scrollableAreaForScrollLayerID to scrollableAreaForScrollingNodeID
https://bugs.webkit.org/show_bug.cgi?id=211091

Reviewed by Myles C. Maxfield.

The argument to scrollableAreaForScrollLayerID() is a ScrollingNodeID, not a layerID.

  • page/FrameView.cpp:

(WebCore::FrameView::scrollableAreaForScrollingNodeID const):
(WebCore::FrameView::scrollableAreaForScrollLayerID const): Deleted.

  • page/FrameView.h:
  • page/scrolling/AsyncScrollingCoordinator.cpp:

(WebCore::AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScroll):
(WebCore::AsyncScrollingCoordinator::setActiveScrollSnapIndices):

  • rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::scrollableAreaForScrollingNodeID const):
(WebCore::RenderLayerCompositor::scrollableAreaForScrollLayerID const): Deleted.

  • rendering/RenderLayerCompositor.h:
Location:
trunk/Source/WebCore
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r260785 r260788  
     12020-04-27  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Rename scrollableAreaForScrollLayerID to scrollableAreaForScrollingNodeID
     4        https://bugs.webkit.org/show_bug.cgi?id=211091
     5
     6        Reviewed by Myles C. Maxfield.
     7
     8        The argument to scrollableAreaForScrollLayerID() is a ScrollingNodeID, not a layerID.
     9
     10        * page/FrameView.cpp:
     11        (WebCore::FrameView::scrollableAreaForScrollingNodeID const):
     12        (WebCore::FrameView::scrollableAreaForScrollLayerID const): Deleted.
     13        * page/FrameView.h:
     14        * page/scrolling/AsyncScrollingCoordinator.cpp:
     15        (WebCore::AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScroll):
     16        (WebCore::AsyncScrollingCoordinator::setActiveScrollSnapIndices):
     17        * rendering/RenderLayerCompositor.cpp:
     18        (WebCore::RenderLayerCompositor::scrollableAreaForScrollingNodeID const):
     19        (WebCore::RenderLayerCompositor::scrollableAreaForScrollLayerID const): Deleted.
     20        * rendering/RenderLayerCompositor.h:
     21
    1222020-04-27  Ryan Haddad  <ryanhaddad@apple.com>
    223
  • trunk/Source/WebCore/page/FrameView.cpp

    r260774 r260788  
    881881}
    882882
    883 ScrollableArea* FrameView::scrollableAreaForScrollLayerID(uint64_t nodeID) const
     883ScrollableArea* FrameView::scrollableAreaForScrollingNodeID(ScrollingNodeID nodeID) const
    884884{
    885885    RenderView* renderView = this->renderView();
     
    887887        return nullptr;
    888888
    889     return renderView->compositor().scrollableAreaForScrollLayerID(nodeID);
     889    return renderView->compositor().scrollableAreaForScrollingNodeID(nodeID);
    890890}
    891891
  • trunk/Source/WebCore/page/FrameView.h

    r260415 r260788  
    161161
    162162    ScrollingNodeID scrollingNodeID() const override;
    163     ScrollableArea* scrollableAreaForScrollLayerID(uint64_t) const;
     163    ScrollableArea* scrollableAreaForScrollingNodeID(ScrollingNodeID) const;
    164164    bool usesAsyncScrolling() const final;
    165165
  • trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp

    r260716 r260788  
    390390
    391391    // Overflow-scroll area.
    392     if (auto* scrollableArea = frameView.scrollableAreaForScrollLayerID(scrollingNodeID)) {
     392    if (auto* scrollableArea = frameView.scrollableAreaForScrollingNodeID(scrollingNodeID)) {
    393393        auto previousScrollType = scrollableArea->currentScrollType();
    394394        scrollableArea->setCurrentScrollType(scrollType);
     
    876876   
    877877    // Overflow-scroll area.
    878     if (auto* scrollableArea = frameView->scrollableAreaForScrollLayerID(scrollingNodeID)) {
     878    if (auto* scrollableArea = frameView->scrollableAreaForScrollingNodeID(scrollingNodeID)) {
    879879        scrollableArea->setCurrentHorizontalSnapPointIndex(horizontalIndex);
    880880        scrollableArea->setCurrentVerticalSnapPointIndex(verticalIndex);
  • trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

    r260774 r260788  
    47624762}
    47634763
    4764 ScrollableArea* RenderLayerCompositor::scrollableAreaForScrollLayerID(ScrollingNodeID nodeID) const
     4764ScrollableArea* RenderLayerCompositor::scrollableAreaForScrollingNodeID(ScrollingNodeID nodeID) const
    47654765{
    47664766    if (!nodeID)
  • trunk/Source/WebCore/rendering/RenderLayerCompositor.h

    r260171 r260788  
    347347    bool isLayerForIFrameWithScrollCoordinatedContents(const RenderLayer&) const;
    348348
    349     ScrollableArea* scrollableAreaForScrollLayerID(ScrollingNodeID) const;
     349    ScrollableArea* scrollableAreaForScrollingNodeID(ScrollingNodeID) const;
    350350
    351351    void removeFromScrollCoordinatedLayers(RenderLayer&);
Note: See TracChangeset for help on using the changeset viewer.