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

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

Issue 2379863003: Implement AnimationEffectTimingReadOnly interface (Closed)
Patch Set: Response to review, update formatting of new files Created 4 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/AnimationEffectTiming.cpp
diff --git a/third_party/WebKit/Source/core/animation/AnimationEffectTiming.cpp b/third_party/WebKit/Source/core/animation/AnimationEffectTiming.cpp
index 709f0452b8333868591523e9ce057100eb1e312e..110b4dc546b8f762b96404ece71593b716134e23 100644
--- a/third_party/WebKit/Source/core/animation/AnimationEffectTiming.cpp
+++ b/third_party/WebKit/Source/core/animation/AnimationEffectTiming.cpp
@@ -7,6 +7,7 @@
#include "bindings/core/v8/ExceptionState.h"
#include "bindings/core/v8/UnrestrictedDoubleOrString.h"
#include "core/animation/AnimationEffectReadOnly.h"
+#include "core/animation/AnimationEffectTimingReadOnly.h"
#include "core/animation/KeyframeEffect.h"
#include "platform/animation/TimingFunction.h"
@@ -18,47 +19,7 @@ AnimationEffectTiming* AnimationEffectTiming::create(
}
AnimationEffectTiming::AnimationEffectTiming(AnimationEffectReadOnly* parent)
- : m_parent(parent) {}
-
-double AnimationEffectTiming::delay() {
- return m_parent->specifiedTiming().startDelay * 1000;
-}
-
-double AnimationEffectTiming::endDelay() {
- return m_parent->specifiedTiming().endDelay * 1000;
-}
-
-String AnimationEffectTiming::fill() {
- return Timing::fillModeString(m_parent->specifiedTiming().fillMode);
-}
-
-double AnimationEffectTiming::iterationStart() {
- return m_parent->specifiedTiming().iterationStart;
-}
-
-double AnimationEffectTiming::iterations() {
- return m_parent->specifiedTiming().iterationCount;
-}
-
-void AnimationEffectTiming::duration(UnrestrictedDoubleOrString& returnValue) {
- if (std::isnan(m_parent->specifiedTiming().iterationDuration))
- returnValue.setString("auto");
- else
- returnValue.setUnrestrictedDouble(
- m_parent->specifiedTiming().iterationDuration * 1000);
-}
-
-double AnimationEffectTiming::playbackRate() {
- return m_parent->specifiedTiming().playbackRate;
-}
-
-String AnimationEffectTiming::direction() {
- return Timing::playbackDirectionString(m_parent->specifiedTiming().direction);
-}
-
-String AnimationEffectTiming::easing() {
- return m_parent->specifiedTiming().timingFunction->toString();
-}
+ : AnimationEffectTimingReadOnly(parent) {}
void AnimationEffectTiming::setDelay(double delay) {
Timing timing = m_parent->specifiedTiming();
@@ -125,7 +86,7 @@ void AnimationEffectTiming::setEasing(String easing,
}
DEFINE_TRACE(AnimationEffectTiming) {
- visitor->trace(m_parent);
+ AnimationEffectTimingReadOnly::trace(visitor);
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698