third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp - Issue 1459023002: Compositor Animation Timelines: Fix frame swapping tests in WebFrameTest.cpp

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 1459023002: Compositor Animation Timelines: Fix frame swapping tests in WebFrameTest.cpp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month 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

« no previous file with comments | « third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h ('k') | third_party/WebKit/Source/web/WebFrame.cpp » ('j') | third_party/WebKit/Source/web/WebFrame.cpp » ('J')
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 21d917202486441d4f508ecff067c2ceac658fa5..80172f10c57ff5b2a5cf2822b524f33841227ff5 100644

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

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

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

, m_wasFrameScrollable(false)

, m_lastMainThreadScrollingReasons(0)

{

- createProgrammaticScrollAnimatorTimeline();

}

ScrollingCoordinator::~ScrollingCoordinator()

@@ -720,6 +719,16 @@ void ScrollingCoordinator::setShouldUpdateScrollLayerPositionOnMainThread(MainTh

}

+void ScrollingCoordinator::onSetMainFrame()

+ createProgrammaticScrollAnimatorTimeline();

+void ScrollingCoordinator::willSwapMainFrame()

+ destroyProgrammaticScrollAnimatorTimeline();

void ScrollingCoordinator::willCloseLayerTreeView()

{

destroyProgrammaticScrollAnimatorTimeline();