third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp - Issue 1739743003: Blink Compositor Animation: Erase old animation system.

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/CompositorAnimationsTest.cpp

Issue 1739743003: Blink Compositor Animation: Erase old animation system. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Exclude histograms.xml Created 4 years, 10 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/CompositorAnimations.cpp ('k') | third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 1a599a7b9261e7a7e52f599468620b4675ff8c98..de66475bd575d2b8d29863da9f1ba8cc2ba9f842 100644

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

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

@@ -109,18 +109,16 @@ protected:

m_keyframeVector5 = createCompositableFloatKeyframeVector(5);

m_keyframeAnimationEffect5 = AnimatableValueKeyframeEffectModel::create(*m_keyframeVector5);

- if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {

- EXPECT_CALL(*m_mockCompositorFactory, createAnimationTimeline())

- .WillOnce(Return(new WebCompositorAnimationTimelineMock()));

- }

+ EXPECT_CALL(*m_mockCompositorFactory, createAnimationTimeline())

+ .WillOnce(Return(new WebCompositorAnimationTimelineMock()));

m_pageHolder = DummyPageHolder::create();

m_document = &m_pageHolder->document();

m_document->animationClock().resetTimeForTesting();

- if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {

- EXPECT_CALL(*m_mockCompositorFactory, createAnimationTimeline())

- .WillOnce(Return(new WebCompositorAnimationTimelineMock()));

- }

+ EXPECT_CALL(*m_mockCompositorFactory, createAnimationTimeline())

+ .WillOnce(Return(new WebCompositorAnimationTimelineMock()));

m_timeline = AnimationTimeline::create(m_document.get());

m_timeline->resetForTesting();

m_element = m_document->createElement("test", ASSERT_NO_EXCEPTION);