| Index: third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.cpp
|
| diff --git a/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.cpp
|
| index 52c53a56774092d34577736fda1b8f66e05b3ac4..9d0dbcc9ebf9057b8ce5ad12e461d2592635ab9e 100644
|
| --- a/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.cpp
|
| +++ b/third_party/WebKit/Source/core/inspector/InspectorAnimationAgent.cpp
|
| @@ -89,7 +89,7 @@ void InspectorAnimationAgent::didCommitLoadForLocalFrame(LocalFrame* frame)
|
| setPlaybackRate(nullptr, playbackRate);
|
| }
|
|
|
| -static PassOwnPtr<protocol::Animation::AnimationEffect> buildObjectForAnimationEffect(KeyframeEffect* effect, bool isTransition)
|
| +static std::unique_ptr<protocol::Animation::AnimationEffect> buildObjectForAnimationEffect(KeyframeEffect* effect, bool isTransition)
|
| {
|
| ComputedTimingProperties computedTiming = effect->getComputedTiming();
|
| double delay = computedTiming.delay();
|
| @@ -110,7 +110,7 @@ static PassOwnPtr<protocol::Animation::AnimationEffect> buildObjectForAnimationE
|
| }
|
| }
|
|
|
| - OwnPtr<protocol::Animation::AnimationEffect> animationObject = protocol::Animation::AnimationEffect::create()
|
| + std::unique_ptr<protocol::Animation::AnimationEffect> animationObject = protocol::Animation::AnimationEffect::create()
|
| .setDelay(delay)
|
| .setEndDelay(computedTiming.endDelay())
|
| .setPlaybackRate(computedTiming.playbackRate())
|
| @@ -124,25 +124,25 @@ static PassOwnPtr<protocol::Animation::AnimationEffect> buildObjectForAnimationE
|
| return animationObject;
|
| }
|
|
|
| -static PassOwnPtr<protocol::Animation::KeyframeStyle> buildObjectForStringKeyframe(const StringKeyframe* keyframe)
|
| +static std::unique_ptr<protocol::Animation::KeyframeStyle> buildObjectForStringKeyframe(const StringKeyframe* keyframe)
|
| {
|
| Decimal decimal = Decimal::fromDouble(keyframe->offset() * 100);
|
| String offset = decimal.toString();
|
| offset.append("%");
|
|
|
| - OwnPtr<protocol::Animation::KeyframeStyle> keyframeObject = protocol::Animation::KeyframeStyle::create()
|
| + std::unique_ptr<protocol::Animation::KeyframeStyle> keyframeObject = protocol::Animation::KeyframeStyle::create()
|
| .setOffset(offset)
|
| .setEasing(keyframe->easing().toString()).build();
|
| return keyframeObject;
|
| }
|
|
|
| -static PassOwnPtr<protocol::Animation::KeyframesRule> buildObjectForAnimationKeyframes(const KeyframeEffect* effect)
|
| +static std::unique_ptr<protocol::Animation::KeyframesRule> buildObjectForAnimationKeyframes(const KeyframeEffect* effect)
|
| {
|
| if (!effect || !effect->model() || !effect->model()->isKeyframeEffectModel())
|
| return nullptr;
|
| const KeyframeEffectModelBase* model = toKeyframeEffectModelBase(effect->model());
|
| Vector<RefPtr<Keyframe>> normalizedKeyframes = KeyframeEffectModelBase::normalizedKeyframesForInspector(model->getFrames());
|
| - OwnPtr<protocol::Array<protocol::Animation::KeyframeStyle>> keyframes = protocol::Array<protocol::Animation::KeyframeStyle>::create();
|
| + std::unique_ptr<protocol::Array<protocol::Animation::KeyframeStyle>> keyframes = protocol::Array<protocol::Animation::KeyframeStyle>::create();
|
|
|
| for (const auto& keyframe : normalizedKeyframes) {
|
| // Ignore CSS Transitions
|
| @@ -154,11 +154,11 @@ static PassOwnPtr<protocol::Animation::KeyframesRule> buildObjectForAnimationKey
|
| return protocol::Animation::KeyframesRule::create().setKeyframes(std::move(keyframes)).build();
|
| }
|
|
|
| -PassOwnPtr<protocol::Animation::Animation> InspectorAnimationAgent::buildObjectForAnimation(blink::Animation& animation)
|
| +std::unique_ptr<protocol::Animation::Animation> InspectorAnimationAgent::buildObjectForAnimation(blink::Animation& animation)
|
| {
|
| const Element* element = toKeyframeEffect(animation.effect())->target();
|
| CSSAnimations& cssAnimations = element->elementAnimations()->cssAnimations();
|
| - OwnPtr<protocol::Animation::KeyframesRule> keyframeRule = nullptr;
|
| + std::unique_ptr<protocol::Animation::KeyframesRule> keyframeRule = nullptr;
|
| String animationType;
|
|
|
| if (cssAnimations.isTransitionAnimationForInspector(animation)) {
|
| @@ -174,10 +174,10 @@ PassOwnPtr<protocol::Animation::Animation> InspectorAnimationAgent::buildObjectF
|
| m_idToAnimation.set(id, &animation);
|
| m_idToAnimationType.set(id, animationType);
|
|
|
| - OwnPtr<protocol::Animation::AnimationEffect> animationEffectObject = buildObjectForAnimationEffect(toKeyframeEffect(animation.effect()), animationType == AnimationType::CSSTransition);
|
| + std::unique_ptr<protocol::Animation::AnimationEffect> animationEffectObject = buildObjectForAnimationEffect(toKeyframeEffect(animation.effect()), animationType == AnimationType::CSSTransition);
|
| animationEffectObject->setKeyframesRule(std::move(keyframeRule));
|
|
|
| - OwnPtr<protocol::Animation::Animation> animationObject = protocol::Animation::Animation::create()
|
| + std::unique_ptr<protocol::Animation::Animation> animationObject = protocol::Animation::Animation::create()
|
| .setId(id)
|
| .setName(animation.id())
|
| .setPausedState(animation.paused())
|
| @@ -220,7 +220,7 @@ void InspectorAnimationAgent::getCurrentTime(ErrorString* errorString, const Str
|
| }
|
| }
|
|
|
| -void InspectorAnimationAgent::setPaused(ErrorString* errorString, PassOwnPtr<protocol::Array<String>> animationIds, bool paused)
|
| +void InspectorAnimationAgent::setPaused(ErrorString* errorString, std::unique_ptr<protocol::Array<String>> animationIds, bool paused)
|
| {
|
| for (size_t i = 0; i < animationIds->length(); ++i) {
|
| String animationId = animationIds->get(i);
|
| @@ -289,7 +289,7 @@ blink::Animation* InspectorAnimationAgent::animationClone(blink::Animation* anim
|
| return m_idToAnimationClone.get(id);
|
| }
|
|
|
| -void InspectorAnimationAgent::seekAnimations(ErrorString* errorString, PassOwnPtr<protocol::Array<String>> animationIds, double currentTime)
|
| +void InspectorAnimationAgent::seekAnimations(ErrorString* errorString, std::unique_ptr<protocol::Array<String>> animationIds, double currentTime)
|
| {
|
| for (size_t i = 0; i < animationIds->length(); ++i) {
|
| String animationId = animationIds->get(i);
|
| @@ -307,7 +307,7 @@ void InspectorAnimationAgent::seekAnimations(ErrorString* errorString, PassOwnPt
|
| }
|
| }
|
|
|
| -void InspectorAnimationAgent::releaseAnimations(ErrorString* errorString, PassOwnPtr<protocol::Array<String>> animationIds)
|
| +void InspectorAnimationAgent::releaseAnimations(ErrorString* errorString, std::unique_ptr<protocol::Array<String>> animationIds)
|
| {
|
| for (size_t i = 0; i < animationIds->length(); ++i) {
|
| String animationId = animationIds->get(i);
|
| @@ -362,7 +362,7 @@ void InspectorAnimationAgent::setTiming(ErrorString* errorString, const String&
|
| }
|
| }
|
|
|
| -void InspectorAnimationAgent::resolveAnimation(ErrorString* errorString, const String& animationId, OwnPtr<protocol::Runtime::RemoteObject>* result)
|
| +void InspectorAnimationAgent::resolveAnimation(ErrorString* errorString, const String& animationId, std::unique_ptr<protocol::Runtime::RemoteObject>* result)
|
| {
|
| blink::Animation* animation = assertAnimation(errorString, animationId);
|
| if (!animation)
|
|
|