| Index: third_party/WebKit/Source/core/animation/KeyframeEffect.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/KeyframeEffect.cpp b/third_party/WebKit/Source/core/animation/KeyframeEffect.cpp
|
| index e0e76491fb6446edc3317a145a4c2313d8f1366c..fb3984b37a43a2b191d2472aba387867383e41cd 100644
|
| --- a/third_party/WebKit/Source/core/animation/KeyframeEffect.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/KeyframeEffect.cpp
|
| @@ -39,6 +39,7 @@
|
| #include "core/animation/Interpolation.h"
|
| #include "core/animation/KeyframeEffectModel.h"
|
| #include "core/animation/KeyframeEffectOptions.h"
|
| +#include "core/animation/KeyframeEffectReadOnly.h"
|
| #include "core/animation/PropertyHandle.h"
|
| #include "core/dom/Element.h"
|
| #include "core/dom/NodeComputedStyle.h"
|
| @@ -48,7 +49,7 @@
|
|
|
| namespace blink {
|
|
|
| -KeyframeEffect* KeyframeEffect::create(Element* target, EffectModel* model, const Timing& timing, Priority priority, EventDelegate* eventDelegate)
|
| +KeyframeEffect* KeyframeEffect::create(Element* target, EffectModel* model, const Timing& timing, KeyframeEffectReadOnly::Priority priority, EventDelegate* eventDelegate)
|
| {
|
| return new KeyframeEffect(target, model, timing, priority, eventDelegate);
|
| }
|
| @@ -84,12 +85,8 @@ KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme
|
| return create(element, EffectInput::convert(element, effectInput, executionContext, exceptionState), Timing());
|
| }
|
|
|
| -KeyframeEffect::KeyframeEffect(Element* target, EffectModel* model, const Timing& timing, Priority priority, EventDelegate* eventDelegate)
|
| - : AnimationEffectReadOnly(timing, eventDelegate)
|
| - , m_target(target)
|
| - , m_model(model)
|
| - , m_sampledEffect(nullptr)
|
| - , m_priority(priority)
|
| +KeyframeEffect::KeyframeEffect(Element* target, EffectModel* model, const Timing& timing, KeyframeEffectReadOnly::Priority priority, EventDelegate* eventDelegate)
|
| + : KeyframeEffectReadOnly(target, model, timing, priority, eventDelegate)
|
| {
|
| }
|
|
|
| @@ -363,10 +360,7 @@ void KeyframeEffect::attachCompositedLayers()
|
|
|
| DEFINE_TRACE(KeyframeEffect)
|
| {
|
| - visitor->trace(m_target);
|
| - visitor->trace(m_model);
|
| - visitor->trace(m_sampledEffect);
|
| - AnimationEffectReadOnly::trace(visitor);
|
| + KeyframeEffectReadOnly::trace(visitor);
|
| }
|
|
|
| } // namespace blink
|
|
|