third_party/WebKit/Source/core/css/resolver/StyleResolver.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/css/resolver/StyleResolver.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:

Index: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

index 0d8fe07592db85d3f42eb3bf6b7a6b57b69ba8b0..7da43f601afc863f2933a39ddb3eb887cb5d2ce3 100644

--- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

@@ -34,7 +34,6 @@

#include "core/HTMLNames.h"

#include "core/MediaTypeNames.h"

#include "core/StylePropertyShorthand.h"

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

#include "core/animation/CSSInterpolationEnvironment.h"

#include "core/animation/CSSInterpolationTypesMap.h"

#include "core/animation/ElementAnimations.h"