| Index: Source/core/animation/AnimationStackTest.cpp
|
| diff --git a/Source/core/animation/AnimationStackTest.cpp b/Source/core/animation/AnimationStackTest.cpp
|
| index ec0b5137d3aa3087b0696e4415d372c27f2f1523..490f6daf78f696f22de153db13dde9b1d00403cc 100644
|
| --- a/Source/core/animation/AnimationStackTest.cpp
|
| +++ b/Source/core/animation/AnimationStackTest.cpp
|
| @@ -39,7 +39,7 @@ protected:
|
| timeline->serviceAnimations(TimingUpdateForAnimationFrame);
|
| }
|
|
|
| - const WillBeHeapVector<OwnPtrWillBeMember<SampledEffect> >& effects()
|
| + const WillBeHeapVector<OwnPtrWillBeMember<SampledEffect>>& effects()
|
| {
|
| return element->ensureElementAnimations().defaultStack().m_effects;
|
| }
|
| @@ -86,7 +86,7 @@ TEST_F(AnimationAnimationStackTest, ElementAnimationsSorted)
|
| play(makeAnimation(makeAnimationEffect(CSSPropertyFontSize, AnimatableDouble::create(1))).get(), 10);
|
| play(makeAnimation(makeAnimationEffect(CSSPropertyFontSize, AnimatableDouble::create(2))).get(), 15);
|
| play(makeAnimation(makeAnimationEffect(CSSPropertyFontSize, AnimatableDouble::create(3))).get(), 5);
|
| - WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > result = AnimationStack::activeInterpolations(&element->elementAnimations()->defaultStack(), 0, 0, Animation::DefaultPriority, 0);
|
| + WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>> result = AnimationStack::activeInterpolations(&element->elementAnimations()->defaultStack(), 0, 0, Animation::DefaultPriority, 0);
|
| EXPECT_EQ(1u, result.size());
|
| EXPECT_TRUE(interpolationValue(result.get(CSSPropertyFontSize))->equals(AnimatableDouble::create(3).get()));
|
| }
|
| @@ -95,12 +95,12 @@ TEST_F(AnimationAnimationStackTest, NewAnimations)
|
| {
|
| play(makeAnimation(makeAnimationEffect(CSSPropertyFontSize, AnimatableDouble::create(1))).get(), 15);
|
| play(makeAnimation(makeAnimationEffect(CSSPropertyZIndex, AnimatableDouble::create(2))).get(), 10);
|
| - WillBeHeapVector<RawPtrWillBeMember<InertAnimation> > newAnimations;
|
| + WillBeHeapVector<RawPtrWillBeMember<InertAnimation>> newAnimations;
|
| RefPtrWillBeRawPtr<InertAnimation> inert1 = makeInertAnimation(makeAnimationEffect(CSSPropertyFontSize, AnimatableDouble::create(3)));
|
| RefPtrWillBeRawPtr<InertAnimation> inert2 = makeInertAnimation(makeAnimationEffect(CSSPropertyZIndex, AnimatableDouble::create(4)));
|
| newAnimations.append(inert1.get());
|
| newAnimations.append(inert2.get());
|
| - WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > result = AnimationStack::activeInterpolations(&element->elementAnimations()->defaultStack(), &newAnimations, 0, Animation::DefaultPriority, 10);
|
| + WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>> result = AnimationStack::activeInterpolations(&element->elementAnimations()->defaultStack(), &newAnimations, 0, Animation::DefaultPriority, 10);
|
| EXPECT_EQ(2u, result.size());
|
| EXPECT_TRUE(interpolationValue(result.get(CSSPropertyFontSize))->equals(AnimatableDouble::create(3).get()));
|
| EXPECT_TRUE(interpolationValue(result.get(CSSPropertyZIndex))->equals(AnimatableDouble::create(4).get()));
|
| @@ -108,11 +108,11 @@ TEST_F(AnimationAnimationStackTest, NewAnimations)
|
|
|
| TEST_F(AnimationAnimationStackTest, CancelledAnimationPlayers)
|
| {
|
| - WillBeHeapHashSet<RawPtrWillBeMember<const AnimationPlayer> > cancelledAnimationPlayers;
|
| + WillBeHeapHashSet<RawPtrWillBeMember<const AnimationPlayer>> cancelledAnimationPlayers;
|
| RefPtrWillBeRawPtr<AnimationPlayer> player = play(makeAnimation(makeAnimationEffect(CSSPropertyFontSize, AnimatableDouble::create(1))).get(), 0);
|
| cancelledAnimationPlayers.add(player.get());
|
| play(makeAnimation(makeAnimationEffect(CSSPropertyZIndex, AnimatableDouble::create(2))).get(), 0);
|
| - WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > result = AnimationStack::activeInterpolations(&element->elementAnimations()->defaultStack(), 0, &cancelledAnimationPlayers, Animation::DefaultPriority, 0);
|
| + WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>> result = AnimationStack::activeInterpolations(&element->elementAnimations()->defaultStack(), 0, &cancelledAnimationPlayers, Animation::DefaultPriority, 0);
|
| EXPECT_EQ(1u, result.size());
|
| EXPECT_TRUE(interpolationValue(result.get(CSSPropertyZIndex))->equals(AnimatableDouble::create(2).get()));
|
| }
|
|
|