third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp - Issue 2297943002: Rename kAnimatingScrollOnMainThread to kHandlingScrollFromMainThread

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp

Issue 2297943002: Rename kAnimatingScrollOnMainThread to kHandlingScrollFromMainThread (Closed)

Patch Set: Fix failing tests Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« cc/input/main_thread_scrolling_reason.h ('K') | « third_party/WebKit/LayoutTests/virtual/threaded/fast/scroll-behavior/smooth-scroll/main-thread-scrolling-reason-correctness.html ('k') | third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp

diff --git a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp

index e8eae7edafd79f34a30654c791dd22ec0ab1beca..b2398cfabdae21dd6adc77131fb41536cdf0eef2 100644

--- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp

+++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp

@@ -699,7 +699,7 @@ void ScrollingCoordinator::setShouldUpdateScrollLayerPositionOnMainThread(MainTh

// Clear all main thread scrolling reasons except the one that's set

// if there is a running scroll animation.

uint32_t mainThreadScrollingReasonsToClear = ~0u;

- mainThreadScrollingReasonsToClear &= ~MainThreadScrollingReason::kAnimatingScrollOnMainThread;

+ mainThreadScrollingReasonsToClear &= ~MainThreadScrollingReason::kHandlingScrollFromMainThread;

scrollLayer->clearMainThreadScrollingReasons(mainThreadScrollingReasonsToClear);

if (visualViewportScrollLayer)

visualViewportScrollLayer->clearMainThreadScrollingReasons(mainThreadScrollingReasonsToClear);