third_party/WebKit/Source/core/page/Page.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/Page.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: Plumb it from detach method instead. 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

« third_party/WebKit/Source/core/frame/Frame.cpp ('K') | « third_party/WebKit/Source/core/page/Page.h ('k') | third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.h » ('j') | third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/page/Page.cpp

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

index 2377b940add2cccf43103e6a8f9599ac1b52cbfb..1dafaec6f7739efa02f614d58767f2dd325869de 100644

--- a/third_party/WebKit/Source/core/page/Page.cpp

+++ b/third_party/WebKit/Source/core/page/Page.cpp

@@ -199,6 +199,15 @@ void Page::setMainFrame(Frame* mainFrame)

// is called in the base constructor for both LocalFrame and RemoteFrame,

// when the vtables for the derived classes have not yet been setup.

m_mainFrame = mainFrame;

+ if (scrollingCoordinator())

+ scrollingCoordinator()->onSetMainFrame();

+void Page::willSwapMainFrame()

+ if (m_scrollingCoordinator)

+ m_scrollingCoordinator->willSwapMainFrame();

}

void Page::documentDetached(Document* document)