third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp - Issue 2948193002: Merge AnimationTimeline and DocumentTimeline

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/animation/CompositorPendingAnimations.cpp

Issue 2948193002: Merge AnimationTimeline and DocumentTimeline (Closed)

Patch Set: Fix rebase error Created 3 years, 6 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

« no previous file with comments | « third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp ('k') | third_party/WebKit/Source/core/animation/DocumentTimeline.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp

diff --git a/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp b/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp

index 265a18d4c047f9bdbf6c484ac7b14e48559ec02b..def6be2f4f5c641251fec97a4bf976fd87c66ef3 100644

--- a/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp

+++ b/third_party/WebKit/Source/core/animation/CompositorPendingAnimations.cpp

@@ -30,7 +30,7 @@

#include "core/animation/CompositorPendingAnimations.h"

-#include "core/animation/AnimationTimeline.h"

+#include "core/animation/DocumentTimeline.h"

#include "core/animation/KeyframeEffect.h"

#include "core/dom/Document.h"

#include "core/frame/LocalFrameView.h"