third_party/WebKit/Source/web/WebPagePopupImpl.cpp - Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation

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/web/WebPagePopupImpl.cpp

Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix ScrollAnimatorCompositorCoordinator for MSVC. Created 4 years, 11 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

« third_party/WebKit/Source/web/LinkHighlightImpl.cpp ('K') | « third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp ('k') | third_party/WebKit/Source/web/WebViewImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/WebPagePopupImpl.cpp

diff --git a/third_party/WebKit/Source/web/WebPagePopupImpl.cpp b/third_party/WebKit/Source/web/WebPagePopupImpl.cpp

index 541a27877473db84456caaa249127ae2ad98fe4a..167d62ee0aefa398b4541f34d129535025869270 100644

--- a/third_party/WebKit/Source/web/WebPagePopupImpl.cpp

+++ b/third_party/WebKit/Source/web/WebPagePopupImpl.cpp

@@ -133,13 +133,13 @@ private:

void attachCompositorAnimationTimeline(WebCompositorAnimationTimeline* timeline, LocalFrame*) override

{

if (m_popup->m_layerTreeView)

- m_popup->m_layerTreeView->attachCompositorAnimationTimeline(timeline);

+ m_popup->m_layerTreeView->attachCompositorAnimationTimeline(timeline->animationTimeline());

}

void detachCompositorAnimationTimeline(WebCompositorAnimationTimeline* timeline, LocalFrame*) override

{

if (m_popup->m_layerTreeView)

- m_popup->m_layerTreeView->detachCompositorAnimationTimeline(timeline);

+ m_popup->m_layerTreeView->detachCompositorAnimationTimeline(timeline->animationTimeline());

}

WebScreenInfo screenInfo() const override