Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(314)

Unified Diff: third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp

Issue 1410313004: Web Animations: Use a single animation clock (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. 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
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 adfb395bd1316a5e7707d006ee46f04a9c6f5e54..11f0af7aa9adba4a812a4b814a38f58686044c4b 100644
--- a/third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp
+++ b/third_party/WebKit/Source/core/animation/CompositorAnimationsTest.cpp
@@ -44,6 +44,7 @@
#include "core/animation/animatable/AnimatableValueTestHelper.h"
#include "core/dom/Document.h"
#include "core/layout/LayoutObject.h"
+#include "core/testing/DummyPageHolder.h"
#include "platform/geometry/FloatBox.h"
#include "platform/geometry/IntSize.h"
#include "platform/graphics/filters/FilterOperations.h"
@@ -83,6 +84,7 @@ protected:
RefPtrWillBePersistent<Document> m_document;
RefPtrWillBePersistent<Element> m_element;
Persistent<AnimationTimeline> m_timeline;
+ OwnPtr<DummyPageHolder> m_pageHolder;
virtual void SetUp()
{
@@ -105,9 +107,11 @@ protected:
m_keyframeVector5 = createCompositableFloatKeyframeVector(5);
m_keyframeAnimationEffect5 = AnimatableValueKeyframeEffectModel::create(*m_keyframeVector5);
- m_document = Document::create();
+ m_pageHolder = DummyPageHolder::create();
+ m_document = &m_pageHolder->document();
m_document->animationClock().resetTimeForTesting();
m_timeline = AnimationTimeline::create(m_document.get());
+ m_timeline->resetForTesting();
m_element = m_document->createElement("test", ASSERT_NO_EXCEPTION);
}

Powered by Google App Engine
This is Rietveld 408576698