| 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 c562f63b8da5b5386e3dfb48187a9c6982b7bd25..0a7b71c23ac2fcb27774192753941f257dfae71f 100644
|
| --- a/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.h
|
| +++ b/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.h
|
| @@ -38,11 +38,11 @@ public:
|
| void getPlaybackRate(ErrorString*, double* playbackRate) override;
|
| void setPlaybackRate(ErrorString*, double playbackRate) override;
|
| void getCurrentTime(ErrorString*, const String& id, double* currentTime) override;
|
| - void setPaused(ErrorString*, PassOwnPtr<protocol::Array<String>> animations, bool paused) override;
|
| + void setPaused(ErrorString*, std::unique_ptr<protocol::Array<String>> animations, bool paused) override;
|
| void setTiming(ErrorString*, const String& animationId, double duration, double delay) override;
|
| - void seekAnimations(ErrorString*, PassOwnPtr<protocol::Array<String>> animations, double currentTime) override;
|
| - void releaseAnimations(ErrorString*, PassOwnPtr<protocol::Array<String>> animations) override;
|
| - void resolveAnimation(ErrorString*, const String& animationId, OwnPtr<protocol::Runtime::RemoteObject>*) override;
|
| + void seekAnimations(ErrorString*, std::unique_ptr<protocol::Array<String>> animations, double currentTime) override;
|
| + void releaseAnimations(ErrorString*, std::unique_ptr<protocol::Array<String>> animations) override;
|
| + void resolveAnimation(ErrorString*, const String& animationId, std::unique_ptr<protocol::Runtime::RemoteObject>*) override;
|
|
|
| // API for InspectorInstrumentation
|
| void didCreateAnimation(unsigned);
|
| @@ -57,8 +57,8 @@ public:
|
| private:
|
| using AnimationType = protocol::Animation::Animation::TypeEnum;
|
|
|
| - PassOwnPtr<protocol::Animation::Animation> buildObjectForAnimation(blink::Animation&);
|
| - PassOwnPtr<protocol::Animation::Animation> buildObjectForAnimation(blink::Animation&, String, PassOwnPtr<protocol::Animation::KeyframesRule> keyframeRule = nullptr);
|
| + std::unique_ptr<protocol::Animation::Animation> buildObjectForAnimation(blink::Animation&);
|
| + std::unique_ptr<protocol::Animation::Animation> buildObjectForAnimation(blink::Animation&, String, std::unique_ptr<protocol::Animation::KeyframesRule> keyframeRule = nullptr);
|
| double normalizedStartTime(blink::Animation&);
|
| AnimationTimeline& referenceTimeline();
|
| blink::Animation* animationClone(blink::Animation*);
|
|
|