| Index: Source/core/inspector/InspectorAnimationAgent.cpp
|
| diff --git a/Source/core/inspector/InspectorAnimationAgent.cpp b/Source/core/inspector/InspectorAnimationAgent.cpp
|
| index f80c6af7ed2f8602619797384f893abf8536f300..256d5491f9d003527434a0adaa2c773f9b9dcdc6 100644
|
| --- a/Source/core/inspector/InspectorAnimationAgent.cpp
|
| +++ b/Source/core/inspector/InspectorAnimationAgent.cpp
|
| @@ -84,7 +84,7 @@ static PassRefPtr<TypeBuilder::Animation::AnimationEffect> buildObjectForAnimati
|
| // Obtain keyframes and convert keyframes back to delay
|
| ASSERT(effect->model()->isKeyframeEffectModel());
|
| const KeyframeEffectModelBase* model = toKeyframeEffectModelBase(effect->model());
|
| - WillBeHeapVector<RefPtrWillBeMember<Keyframe> > keyframes = KeyframeEffectModelBase::normalizedKeyframesForInspector(model->getFrames());
|
| + HeapVector<Member<Keyframe>> keyframes = KeyframeEffectModelBase::normalizedKeyframesForInspector(model->getFrames());
|
| if (keyframes.size() == 3) {
|
| delay = keyframes.at(1)->offset() * duration;
|
| duration -= delay;
|
| @@ -126,7 +126,7 @@ static PassRefPtr<TypeBuilder::Animation::KeyframesRule> buildObjectForAnimation
|
| if (!effect || !effect->model() || !effect->model()->isKeyframeEffectModel())
|
| return nullptr;
|
| const KeyframeEffectModelBase* model = toKeyframeEffectModelBase(effect->model());
|
| - WillBeHeapVector<RefPtrWillBeMember<Keyframe> > normalizedKeyframes = KeyframeEffectModelBase::normalizedKeyframesForInspector(model->getFrames());
|
| + HeapVector<Member<Keyframe>> normalizedKeyframes = KeyframeEffectModelBase::normalizedKeyframesForInspector(model->getFrames());
|
| RefPtr<TypeBuilder::Array<TypeBuilder::Animation::KeyframeStyle> > keyframes = TypeBuilder::Array<TypeBuilder::Animation::KeyframeStyle>::create();
|
|
|
| for (const auto& keyframe : normalizedKeyframes) {
|
| @@ -217,17 +217,17 @@ void InspectorAnimationAgent::setTiming(ErrorString* errorString, const String&
|
| ASSERT(frames.size() == 3);
|
| KeyframeVector newFrames;
|
| for (int i = 0; i < 3; i++)
|
| - newFrames.append(toAnimatableValueKeyframe(frames[i]->clone().get()));
|
| + newFrames.append(toAnimatableValueKeyframe(frames[i]->clone()));
|
| // Update delay, represented by the distance between the first two keyframes.
|
| newFrames[1]->setOffset(delay / (delay + duration));
|
| model->setFrames(newFrames);
|
|
|
| - RefPtrWillBeRawPtr<AnimationEffectTiming> timing = animation->effect()->timing();
|
| + AnimationEffectTiming* timing = animation->effect()->timing();
|
| UnrestrictedDoubleOrString unrestrictedDuration;
|
| unrestrictedDuration.setUnrestrictedDouble(duration + delay);
|
| timing->setDuration(unrestrictedDuration);
|
| } else if (type == AnimationType::WebAnimation) {
|
| - RefPtrWillBeRawPtr<AnimationEffectTiming> timing = animation->effect()->timing();
|
| + AnimationEffectTiming* timing = animation->effect()->timing();
|
| UnrestrictedDoubleOrString unrestrictedDuration;
|
| unrestrictedDuration.setUnrestrictedDouble(duration);
|
| timing->setDuration(unrestrictedDuration);
|
|
|