Changeset 262043 in webkit


Ignore:
Timestamp:
May 21, 2020 7:21:06 PM (4 years ago)
Author:
Simon Fraser
Message:

Scrolling thread scrolls on sync-scrolling scrollers don't get to the main thread
​https://bugs.webkit.org/show_bug.cgi?id=212225

Fix builds that use Nicosia after r262041.

  • page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp:

(WebCore::ScrollingTreeFrameScrollingNodeNicosia::currentScrollPositionChanged):

  • page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.h:
Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r262042 r262043  
     12020-05-21  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Scrolling thread scrolls on sync-scrolling scrollers don't get to the main thread
     4        https://bugs.webkit.org/show_bug.cgi?id=212225
     5
     6        Fix builds that use Nicosia after r262041.
     7
     8        * page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp:
     9        (WebCore::ScrollingTreeFrameScrollingNodeNicosia::currentScrollPositionChanged):
     10        * page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.h:
     11
    1122020-05-21  Simon Fraser  <simon.fraser@apple.com>
    213

  • trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp

    r261132 r262043  
    163163}
    164164
    165 void ScrollingTreeFrameScrollingNodeNicosia::currentScrollPositionChanged()
     165void ScrollingTreeFrameScrollingNodeNicosia::currentScrollPositionChanged(ScrollingLayerPositionAction action)
    166166{
    167167    LOG_WITH_STREAM(Scrolling, stream << "ScrollingTreeFrameScrollingNodeNicosia::currentScrollPositionChanged to " << currentScrollPosition() << " min: " << minimumScrollPosition() << " max: " << maximumScrollPosition() << " sync: " << hasSynchronousScrollingReasons());
    168168
    169     if (hasSynchronousScrollingReasons())
    170         scrollingTree().scrollingTreeNodeDidScroll(*this, ScrollingLayerPositionAction::Set);
    171     else
    172         ScrollingTreeFrameScrollingNode::currentScrollPositionChanged();
     169    ScrollingTreeFrameScrollingNode::currentScrollPositionChanged(hasSynchronousScrollingReasons() ? ScrollingLayerPositionAction::Set : action);
    173170}
    174171

  • trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.h

    r259112 r262043  
    5959    FloatPoint adjustedScrollPosition(const FloatPoint&, ScrollClamping) const override;
    6060
    61     void currentScrollPositionChanged() override;
     61    void currentScrollPositionChanged(ScrollingLayerPositionAction) override;
    6262
    6363    void repositionScrollingLayers() override;
Note: See TracChangeset for help on using the changeset viewer.