| Index: third_party/WebKit/Source/core/animation/AnimationEffectTiming.h
|
| diff --git a/third_party/WebKit/Source/core/animation/AnimationEffectTiming.h b/third_party/WebKit/Source/core/animation/AnimationEffectTiming.h
|
| index 07ca5c56a7b47283e265fe9190badaef2fc06127..cdbb7759c4f9033dcbbd99c42ceab1d7b4b75ae8 100644
|
| --- a/third_party/WebKit/Source/core/animation/AnimationEffectTiming.h
|
| +++ b/third_party/WebKit/Source/core/animation/AnimationEffectTiming.h
|
| @@ -5,9 +5,9 @@
|
| #ifndef AnimationEffectTiming_h
|
| #define AnimationEffectTiming_h
|
|
|
| -#include "bindings/core/v8/ScriptWrappable.h"
|
| #include "core/CoreExport.h"
|
| #include "core/animation/AnimationEffectReadOnly.h"
|
| +#include "core/animation/AnimationEffectTimingReadOnly.h"
|
| #include "wtf/text/WTFString.h"
|
|
|
| namespace blink {
|
| @@ -15,19 +15,10 @@ namespace blink {
|
| class ExceptionState;
|
| class UnrestrictedDoubleOrString;
|
|
|
| -class CORE_EXPORT AnimationEffectTiming : public GarbageCollected<AnimationEffectTiming>, public ScriptWrappable {
|
| +class CORE_EXPORT AnimationEffectTiming : public AnimationEffectTimingReadOnly {
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| static AnimationEffectTiming* create(AnimationEffectReadOnly* parent);
|
| - double delay();
|
| - double endDelay();
|
| - String fill();
|
| - double iterationStart();
|
| - double iterations();
|
| - void duration(UnrestrictedDoubleOrString&);
|
| - double playbackRate();
|
| - String direction();
|
| - String easing();
|
|
|
| void setDelay(double);
|
| void setEndDelay(double);
|
| @@ -39,10 +30,9 @@ public:
|
| void setDirection(String);
|
| void setEasing(String, ExceptionState&);
|
|
|
| - DECLARE_TRACE();
|
| + DECLARE_VIRTUAL_TRACE();
|
|
|
| private:
|
| - Member<AnimationEffectReadOnly> m_parent;
|
| explicit AnimationEffectTiming(AnimationEffectReadOnly*);
|
| };
|
|
|
|
|