Source/core/page/scrolling/ScrollingCoordinator.cpp - Issue 1323913002: Composited Animations: Support --disable-threaded-animation in new animation system.

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: Source/core/page/scrolling/ScrollingCoordinator.cpp

Issue 1323913002: Composited Animations: Support --disable-threaded-animation in new animation system. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 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

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

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

index 88cb5374019492929b6536d1864a256ab31376c7..e6c7c6621cd5f07c155665802dabc18af9658bee 100644

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

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

@@ -94,7 +94,7 @@ ScrollingCoordinator::ScrollingCoordinator(Page* page)

, m_wasFrameScrollable(false)

, m_lastMainThreadScrollingReasons(0)

{

- if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {

+ if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platform::current()->isThreadedAnimationEnabled()) {

ASSERT(m_page);

ASSERT(m_page->mainFrame()->isLocalFrame());

ASSERT(Platform::current()->compositorSupport());

« no previous file with comments | « Source/core/animation/AnimationTimeline.cpp ('k') | Source/platform/scroll/ProgrammaticScrollAnimator.cpp » ('j') | no next file with comments »