| Index: Source/core/inspector/InspectorAnimationAgent.cpp
|
| diff --git a/Source/core/inspector/InspectorAnimationAgent.cpp b/Source/core/inspector/InspectorAnimationAgent.cpp
|
| index 5a73e99605c192be3bb6c7bd02a66899b8e40c61..d93d0cabbacd5eb6b416121ad73de342c7218e14 100644
|
| --- a/Source/core/inspector/InspectorAnimationAgent.cpp
|
| +++ b/Source/core/inspector/InspectorAnimationAgent.cpp
|
| @@ -81,7 +81,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());
|
| + WillBeHeapVector<RefPtrWillBeMember<Keyframe>> keyframes = KeyframeEffectModelBase::normalizedKeyframesForInspector(effect->getFrames());
|
| if (keyframes.size() == 3) {
|
| delay = keyframes.at(1)->offset() * duration;
|
| duration -= delay;
|
| @@ -136,10 +136,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());
|
| + WillBeHeapVector<RefPtrWillBeMember<Keyframe>> normalizedKeyframes = KeyframeEffectModelBase::normalizedKeyframesForInspector(toKeyframeEffectModelBase(toAnimation(player.source())->effect())->getFrames());
|
| TimingFunction* easing = nullptr;
|
| for (const auto& keyframe : normalizedKeyframes) {
|
| if (styleKeyframe->keys().contains(keyframe->offset()))
|
| @@ -160,8 +160,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();
|
| + WillBeHeapVector<RefPtrWillBeMember<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
|
| @@ -215,9 +215,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());
|
| @@ -229,13 +229,13 @@ 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;
|
| m_idToAnimationPlayer.clear();
|
| - WillBeHeapVector<RefPtrWillBeMember<AnimationPlayer> > players;
|
| + WillBeHeapVector<RefPtrWillBeMember<AnimationPlayer>> players;
|
| if (!includeSubtreeAnimations)
|
| players = ElementAnimation::getAnimationPlayers(*element);
|
| else
|
|
|