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

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

Issue 1417613005: Revert of Web Animations: Use a single animation clock (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
Index: third_party/WebKit/Source/core/animation/AnimationStackTest.cpp
diff --git a/third_party/WebKit/Source/core/animation/AnimationStackTest.cpp b/third_party/WebKit/Source/core/animation/AnimationStackTest.cpp
index bb2bb9e791ad9b738fb2a755323659be64eb16aa..791b440d4a7de4e923e4da6156ae3c6fbd86185b 100644
--- a/third_party/WebKit/Source/core/animation/AnimationStackTest.cpp
+++ b/third_party/WebKit/Source/core/animation/AnimationStackTest.cpp
@@ -11,7 +11,6 @@
#include "core/animation/KeyframeEffectModel.h"
#include "core/animation/LegacyStyleInterpolation.h"
#include "core/animation/animatable/AnimatableDouble.h"
-#include "core/testing/DummyPageHolder.h"
#include <gtest/gtest.h>
namespace blink {
@@ -20,8 +19,7 @@
protected:
virtual void SetUp()
{
- pageHolder = DummyPageHolder::create();
- document = &pageHolder->document();
+ document = Document::create();
document->animationClock().resetTimeForTesting();
timeline = AnimationTimeline::create(document.get());
element = document->createElement("foo", ASSERT_NO_EXCEPTION);
@@ -37,7 +35,7 @@
void updateTimeline(double time)
{
- document->animationClock().updateTime(document->timeline().zeroTime() + time);
+ document->animationClock().updateTime(time);
timeline->serviceAnimations(TimingUpdateForAnimationFrame);
}
@@ -79,7 +77,6 @@
return toLegacyStyleInterpolation(interpolation).currentValue().get();
}
- OwnPtr<DummyPageHolder> pageHolder;
RefPtrWillBePersistent<Document> document;
Persistent<AnimationTimeline> timeline;
RefPtrWillBePersistent<Element> element;

Powered by Google App Engine
This is Rietveld 408576698