| Index: Source/core/inspector/InspectorAnimationAgent.cpp
|
| diff --git a/Source/core/inspector/InspectorAnimationAgent.cpp b/Source/core/inspector/InspectorAnimationAgent.cpp
|
| index f9b4e0d15bf13384d47abac563a6d58fac5e3593..5f5ea7b2b010424b4945881d120f8116a353bf3f 100644
|
| --- a/Source/core/inspector/InspectorAnimationAgent.cpp
|
| +++ b/Source/core/inspector/InspectorAnimationAgent.cpp
|
| @@ -80,7 +80,7 @@ static PassRefPtr<TypeBuilder::Animation::AnimationNode> buildObjectForAnimation
|
| // Obtain keyframes and convert keyframes back to delay
|
| ASSERT(animation->effect()->isKeyframeEffectModel());
|
| const KeyframeEffectModelBase* effect = toKeyframeEffectModelBase(animation->effect());
|
| - WillBeHeapVector<RefPtrWillBeMember<Keyframe> > keyframes = KeyframeEffectModelBase::normalizedKeyframesForInspector(effect->getFrames());
|
| + HeapVector<Member<Keyframe>> keyframes = KeyframeEffectModelBase::normalizedKeyframesForInspector(effect->getFrames());
|
| if (keyframes.size() == 3) {
|
| delay = keyframes.at(1)->offset() * duration;
|
| duration -= delay;
|
| @@ -127,10 +127,10 @@ static PassRefPtr<TypeBuilder::Animation::KeyframeStyle> buildObjectForStringKey
|
|
|
| static PassRefPtr<TypeBuilder::Animation::KeyframesRule> buildObjectForStyleRuleKeyframes(const AnimationPlayer& player, const StyleRuleKeyframes* keyframesRule)
|
| {
|
| - RefPtr<TypeBuilder::Array<TypeBuilder::Animation::KeyframeStyle> > keyframes = TypeBuilder::Array<TypeBuilder::Animation::KeyframeStyle>::create();
|
| - const WillBeHeapVector<RefPtrWillBeMember<StyleRuleKeyframe> >& styleKeyframes = keyframesRule->keyframes();
|
| + RefPtr<TypeBuilder::Array<TypeBuilder::Animation::KeyframeStyle>> keyframes = TypeBuilder::Array<TypeBuilder::Animation::KeyframeStyle>::create();
|
| + const WillBeHeapVector<RefPtrWillBeMember<StyleRuleKeyframe>>& styleKeyframes = keyframesRule->keyframes();
|
| for (const auto& styleKeyframe : styleKeyframes) {
|
| - WillBeHeapVector<RefPtrWillBeMember<Keyframe> > normalizedKeyframes = KeyframeEffectModelBase::normalizedKeyframesForInspector(toKeyframeEffectModelBase(toAnimation(player.source())->effect())->getFrames());
|
| + HeapVector<Member<Keyframe>> normalizedKeyframes = KeyframeEffectModelBase::normalizedKeyframesForInspector(toKeyframeEffectModelBase(toAnimation(player.source())->effect())->getFrames());
|
| TimingFunction* easing = nullptr;
|
| for (const auto& keyframe : normalizedKeyframes) {
|
| if (styleKeyframe->keys().contains(keyframe->offset()))
|
| @@ -151,8 +151,8 @@ static PassRefPtr<TypeBuilder::Animation::KeyframesRule> buildObjectForAnimation
|
| if (!animation->effect()->isKeyframeEffectModel())
|
| return nullptr;
|
| const KeyframeEffectModelBase* effect = toKeyframeEffectModelBase(animation->effect());
|
| - WillBeHeapVector<RefPtrWillBeMember<Keyframe> > normalizedKeyframes = KeyframeEffectModelBase::normalizedKeyframesForInspector(effect->getFrames());
|
| - RefPtr<TypeBuilder::Array<TypeBuilder::Animation::KeyframeStyle> > keyframes = TypeBuilder::Array<TypeBuilder::Animation::KeyframeStyle>::create();
|
| + HeapVector<Member<Keyframe>> normalizedKeyframes = KeyframeEffectModelBase::normalizedKeyframesForInspector(effect->getFrames());
|
| + RefPtr<TypeBuilder::Array<TypeBuilder::Animation::KeyframeStyle>> keyframes = TypeBuilder::Array<TypeBuilder::Animation::KeyframeStyle>::create();
|
|
|
| for (const auto& keyframe : normalizedKeyframes) {
|
| // Ignore CSS Transitions
|
| @@ -210,9 +210,9 @@ PassRefPtr<TypeBuilder::Animation::AnimationPlayer> InspectorAnimationAgent::bui
|
| return playerObject.release();
|
| }
|
|
|
| -PassRefPtr<TypeBuilder::Array<TypeBuilder::Animation::AnimationPlayer> > InspectorAnimationAgent::buildArrayForAnimationPlayers(Element& element, const WillBeHeapVector<RefPtrWillBeMember<AnimationPlayer> > players)
|
| +PassRefPtr<TypeBuilder::Array<TypeBuilder::Animation::AnimationPlayer>> InspectorAnimationAgent::buildArrayForAnimationPlayers(Element& element, const WillBeHeapVector<RefPtrWillBeMember<AnimationPlayer>> players)
|
| {
|
| - RefPtr<TypeBuilder::Array<TypeBuilder::Animation::AnimationPlayer> > animationPlayersArray = TypeBuilder::Array<TypeBuilder::Animation::AnimationPlayer>::create();
|
| + RefPtr<TypeBuilder::Array<TypeBuilder::Animation::AnimationPlayer>> animationPlayersArray = TypeBuilder::Array<TypeBuilder::Animation::AnimationPlayer>::create();
|
| for (const auto& it : players) {
|
| AnimationPlayer& player = *(it.get());
|
| Animation* animation = toAnimation(player.source());
|
| @@ -223,12 +223,12 @@ PassRefPtr<TypeBuilder::Array<TypeBuilder::Animation::AnimationPlayer> > Inspect
|
| return animationPlayersArray.release();
|
| }
|
|
|
| -void InspectorAnimationAgent::getAnimationPlayersForNode(ErrorString* errorString, int nodeId, bool includeSubtreeAnimations, RefPtr<TypeBuilder::Array<TypeBuilder::Animation::AnimationPlayer> >& animationPlayersArray)
|
| +void InspectorAnimationAgent::getAnimationPlayersForNode(ErrorString* errorString, int nodeId, bool includeSubtreeAnimations, RefPtr<TypeBuilder::Array<TypeBuilder::Animation::AnimationPlayer>>& animationPlayersArray)
|
| {
|
| Element* element = m_domAgent->assertElement(errorString, nodeId);
|
| if (!element)
|
| return;
|
| - WillBeHeapVector<RefPtrWillBeMember<AnimationPlayer> > players;
|
| + WillBeHeapVector<RefPtrWillBeMember<AnimationPlayer>> players;
|
| if (!includeSubtreeAnimations)
|
| players = ElementAnimation::getAnimationPlayers(*element);
|
| else
|
| @@ -276,17 +276,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));
|
| effect->setFrames(newFrames);
|
|
|
| - RefPtrWillBeRawPtr<AnimationNodeTiming> timing = player->source()->timing();
|
| + AnimationNodeTiming* timing = player->source()->timing();
|
| UnrestrictedDoubleOrString unrestrictedDuration;
|
| unrestrictedDuration.setUnrestrictedDouble(duration + delay);
|
| timing->setDuration(unrestrictedDuration);
|
| } else if (type == AnimationType::WebAnimation) {
|
| - RefPtrWillBeRawPtr<AnimationNodeTiming> timing = player->source()->timing();
|
| + AnimationNodeTiming* timing = player->source()->timing();
|
| UnrestrictedDoubleOrString unrestrictedDuration;
|
| unrestrictedDuration.setUnrestrictedDouble(duration);
|
| timing->setDuration(unrestrictedDuration);
|
|
|