Changeset 260788 in webkit
- Timestamp:
- Apr 27, 2020 2:57:50 PM (4 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r260785 r260788 1 2020-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 1 22 2020-04-27 Ryan Haddad <ryanhaddad@apple.com> 2 23 -
trunk/Source/WebCore/page/FrameView.cpp
r260774 r260788 881 881 } 882 882 883 ScrollableArea* FrameView::scrollableAreaForScroll LayerID(uint64_tnodeID) const883 ScrollableArea* FrameView::scrollableAreaForScrollingNodeID(ScrollingNodeID nodeID) const 884 884 { 885 885 RenderView* renderView = this->renderView(); … … 887 887 return nullptr; 888 888 889 return renderView->compositor().scrollableAreaForScroll LayerID(nodeID);889 return renderView->compositor().scrollableAreaForScrollingNodeID(nodeID); 890 890 } 891 891 -
trunk/Source/WebCore/page/FrameView.h
r260415 r260788 161 161 162 162 ScrollingNodeID scrollingNodeID() const override; 163 ScrollableArea* scrollableAreaForScroll LayerID(uint64_t) const;163 ScrollableArea* scrollableAreaForScrollingNodeID(ScrollingNodeID) const; 164 164 bool usesAsyncScrolling() const final; 165 165 -
trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp
r260716 r260788 390 390 391 391 // Overflow-scroll area. 392 if (auto* scrollableArea = frameView.scrollableAreaForScroll LayerID(scrollingNodeID)) {392 if (auto* scrollableArea = frameView.scrollableAreaForScrollingNodeID(scrollingNodeID)) { 393 393 auto previousScrollType = scrollableArea->currentScrollType(); 394 394 scrollableArea->setCurrentScrollType(scrollType); … … 876 876 877 877 // Overflow-scroll area. 878 if (auto* scrollableArea = frameView->scrollableAreaForScroll LayerID(scrollingNodeID)) {878 if (auto* scrollableArea = frameView->scrollableAreaForScrollingNodeID(scrollingNodeID)) { 879 879 scrollableArea->setCurrentHorizontalSnapPointIndex(horizontalIndex); 880 880 scrollableArea->setCurrentVerticalSnapPointIndex(verticalIndex); -
trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp
r260774 r260788 4762 4762 } 4763 4763 4764 ScrollableArea* RenderLayerCompositor::scrollableAreaForScroll LayerID(ScrollingNodeID nodeID) const4764 ScrollableArea* RenderLayerCompositor::scrollableAreaForScrollingNodeID(ScrollingNodeID nodeID) const 4765 4765 { 4766 4766 if (!nodeID) -
trunk/Source/WebCore/rendering/RenderLayerCompositor.h
r260171 r260788 347 347 bool isLayerForIFrameWithScrollCoordinatedContents(const RenderLayer&) const; 348 348 349 ScrollableArea* scrollableAreaForScroll LayerID(ScrollingNodeID) const;349 ScrollableArea* scrollableAreaForScrollingNodeID(ScrollingNodeID) const; 350 350 351 351 void removeFromScrollCoordinatedLayers(RenderLayer&);
Note: See TracChangeset
for help on using the changeset viewer.