| Index: third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.h
|
| diff --git a/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.h b/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.h
|
| index d810ed46c6c9edc1e52e20e70a5e2f5d47312039..f173da2677353de9b70f574fab902d2e21f90b87 100644
|
| --- a/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.h
|
| +++ b/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.h
|
| @@ -6,7 +6,6 @@
|
| #define InspectorAnimationAgent_h
|
|
|
| #include "core/CoreExport.h"
|
| -#include "core/InspectorFrontend.h"
|
| #include "core/animation/Animation.h"
|
| #include "core/css/CSSKeyframesRule.h"
|
| #include "core/inspector/InspectorBaseAgent.h"
|
| @@ -24,7 +23,7 @@ class InspectorDOMAgent;
|
| class TimingFunction;
|
| class V8RuntimeAgent;
|
|
|
| -class CORE_EXPORT InspectorAnimationAgent final : public InspectorBaseAgent<InspectorAnimationAgent, InspectorFrontend::Animation>, public InspectorBackendDispatcher::AnimationCommandHandler {
|
| +class CORE_EXPORT InspectorAnimationAgent final : public InspectorBaseAgent<InspectorAnimationAgent, protocol::Frontend::Animation>, public protocol::Dispatcher::AnimationCommandHandler {
|
| WTF_MAKE_NONCOPYABLE(InspectorAnimationAgent);
|
| public:
|
| static PassOwnPtrWillBeRawPtr<InspectorAnimationAgent> create(InspectedFrames* inspectedFrames, InspectorDOMAgent* domAgent, InspectorCSSAgent* cssAgent, V8RuntimeAgent* runtimeAgent)
|
| @@ -44,7 +43,7 @@ public:
|
| void setPaused(ErrorString*, const RefPtr<JSONArray>& animationIds, bool paused) override;
|
| void setTiming(ErrorString*, const String& animationId, double duration, double delay) override;
|
| void seekAnimations(ErrorString*, const RefPtr<JSONArray>& animationIds, double currentTime) override;
|
| - void resolveAnimation(ErrorString*, const String& animationId, RefPtr<TypeBuilder::Runtime::RemoteObject>& result) override;
|
| + void resolveAnimation(ErrorString*, const String& animationId, RefPtr<protocol::TypeBuilder::Runtime::RemoteObject>& result) override;
|
| void releaseAnimations(ErrorString*, const RefPtr<JSONArray>& animationIds) override;
|
|
|
| // API for InspectorInstrumentation
|
| @@ -63,10 +62,10 @@ public:
|
| private:
|
| InspectorAnimationAgent(InspectedFrames*, InspectorDOMAgent*, InspectorCSSAgent*, V8RuntimeAgent*);
|
|
|
| - typedef TypeBuilder::Animation::Animation::Type::Enum AnimationType;
|
| + typedef protocol::TypeBuilder::Animation::Animation::Type::Enum AnimationType;
|
|
|
| - PassRefPtr<TypeBuilder::Animation::Animation> buildObjectForAnimation(Animation&);
|
| - PassRefPtr<TypeBuilder::Animation::Animation> buildObjectForAnimation(Animation&, AnimationType, PassRefPtr<TypeBuilder::Animation::KeyframesRule> keyframeRule = nullptr);
|
| + PassRefPtr<protocol::TypeBuilder::Animation::Animation> buildObjectForAnimation(Animation&);
|
| + PassRefPtr<protocol::TypeBuilder::Animation::Animation> buildObjectForAnimation(Animation&, AnimationType, PassRefPtr<protocol::TypeBuilder::Animation::KeyframesRule> keyframeRule = nullptr);
|
| double normalizedStartTime(Animation&);
|
| AnimationTimeline& referenceTimeline();
|
| Animation* animationClone(Animation*);
|
|
|