Index: Source/core/inspector/InspectorAnimationAgent.cpp |
diff --git a/Source/core/inspector/InspectorAnimationAgent.cpp b/Source/core/inspector/InspectorAnimationAgent.cpp |
index 593e0444e17eb2c4742d781672625fa1f5371abd..b626e3207c849419ff8883278f3eca18da57b907 100644 |
--- a/Source/core/inspector/InspectorAnimationAgent.cpp |
+++ b/Source/core/inspector/InspectorAnimationAgent.cpp |
@@ -82,7 +82,7 @@ static PassRefPtr<TypeBuilder::Animation::AnimationNode> buildObjectForAnimation |
// 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; |
@@ -124,8 +124,8 @@ static PassRefPtr<TypeBuilder::Animation::KeyframesRule> buildObjectForAnimation |
if (!animation->model()->isKeyframeEffectModel()) |
return nullptr; |
const KeyframeEffectModelBase* model = toKeyframeEffectModelBase(animation->model()); |
- WillBeHeapVector<RefPtrWillBeMember<Keyframe> > normalizedKeyframes = KeyframeEffectModelBase::normalizedKeyframesForInspector(model->getFrames()); |
- RefPtr<TypeBuilder::Array<TypeBuilder::Animation::KeyframeStyle> > keyframes = TypeBuilder::Array<TypeBuilder::Animation::KeyframeStyle>::create(); |
+ 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) { |
// Ignore CSS Transitions |
@@ -175,9 +175,9 @@ PassRefPtr<TypeBuilder::Animation::AnimationPlayer> InspectorAnimationAgent::bui |
return playerObject.release(); |
} |
-PassRefPtr<TypeBuilder::Array<TypeBuilder::Animation::AnimationPlayer>> InspectorAnimationAgent::buildArrayForAnimations(Element& element, const WillBeHeapVector<RefPtrWillBeMember<Animation>> players) |
+PassRefPtr<TypeBuilder::Array<TypeBuilder::Animation::AnimationPlayer>> InspectorAnimationAgent::buildArrayForAnimations(Element& element, const HeapVector<Member<Animation>> 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) { |
Animation& player = *(it.get()); |
KeyframeEffect* animation = toKeyframeEffect(player.source()); |
@@ -188,12 +188,12 @@ PassRefPtr<TypeBuilder::Array<TypeBuilder::Animation::AnimationPlayer>> Inspecto |
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<Animation>> players; |
+ HeapVector<Member<Animation>> players; |
if (!includeSubtreeAnimations) |
players = ElementAnimation::getAnimations(*element); |
else |
@@ -241,17 +241,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->source()->timing(); |
+ AnimationEffectTiming* timing = animation->source()->timing(); |
UnrestrictedDoubleOrString unrestrictedDuration; |
unrestrictedDuration.setUnrestrictedDouble(duration + delay); |
timing->setDuration(unrestrictedDuration); |
} else if (type == AnimationType::WebAnimation) { |
- RefPtrWillBeRawPtr<AnimationEffectTiming> timing = animation->source()->timing(); |
+ AnimationEffectTiming* timing = animation->source()->timing(); |
UnrestrictedDoubleOrString unrestrictedDuration; |
unrestrictedDuration.setUnrestrictedDouble(duration); |
timing->setDuration(unrestrictedDuration); |