Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(309)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/core/animation/KeyframeEffectModelTest.cpp

Issue 1120003002: [Oilpan] Migrate most classes under core/animations to Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Build fix Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« Source/core/animation/ElementAnimations.cpp ('K') | « Source/core/animation/KeyframeEffectModel.cpp ('k') | Source/core/animation/LegacyStyleInterpolation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/KeyframeEffectModelTest.cpp
diff --git a/Source/core/animation/KeyframeEffectModelTest.cpp b/Source/core/animation/KeyframeEffectModelTest.cpp
index a77cbd870c26ec16b04f31d6e3c6429893260dc1..bfd42b7c02d46f7008a94698d8061ef636cf1d33 100644
--- a/Source/core/animation/KeyframeEffectModelTest.cpp
+++ b/Source/core/animation/KeyframeEffectModelTest.cpp
@@ -44,51 +44,51 @@ namespace {
const double duration = 1.0;
-PassRefPtrWillBeRawPtr<AnimatableValue> unknownAnimatableValue(double n)
+AnimatableValue* unknownAnimatableValue(double n)
{
return AnimatableUnknown::create(CSSPrimitiveValue::create(n, CSSPrimitiveValue::CSS_UNKNOWN).get());
}
-PassRefPtrWillBeRawPtr<AnimatableValue> pixelAnimatableValue(double n)
+AnimatableValue* pixelAnimatableValue(double n)
{
return AnimatableLength::create(Length(n, Fixed), 1);
}
-AnimatableValueKeyframeVector keyframesAtZeroAndOne(PassRefPtrWillBeRawPtr<AnimatableValue> zeroValue, PassRefPtrWillBeRawPtr<AnimatableValue> oneValue)
+AnimatableValueKeyframeVector keyframesAtZeroAndOne(AnimatableValue* zeroValue, AnimatableValue* oneValue)
{
AnimatableValueKeyframeVector keyframes(2);
keyframes[0] = AnimatableValueKeyframe::create();
keyframes[0]->setOffset(0.0);
- keyframes[0]->setPropertyValue(CSSPropertyLeft, zeroValue.get());
+ keyframes[0]->setPropertyValue(CSSPropertyLeft, zeroValue);
keyframes[1] = AnimatableValueKeyframe::create();
keyframes[1]->setOffset(1.0);
- keyframes[1]->setPropertyValue(CSSPropertyLeft, oneValue.get());
+ keyframes[1]->setPropertyValue(CSSPropertyLeft, oneValue);
return keyframes;
}
-void expectProperty(CSSPropertyID property, PassRefPtrWillBeRawPtr<Interpolation> interpolationValue)
+void expectProperty(CSSPropertyID property, Interpolation* interpolationValue)
{
- LegacyStyleInterpolation* interpolation = toLegacyStyleInterpolation(interpolationValue.get());
+ LegacyStyleInterpolation* interpolation = toLegacyStyleInterpolation(interpolationValue);
ASSERT_EQ(property, interpolation->id());
}
-void expectDoubleValue(double expectedValue, PassRefPtrWillBeRawPtr<Interpolation> interpolationValue)
+void expectDoubleValue(double expectedValue, Interpolation* interpolationValue)
{
- LegacyStyleInterpolation* interpolation = toLegacyStyleInterpolation(interpolationValue.get());
- RefPtrWillBeRawPtr<AnimatableValue> value = interpolation->currentValue();
+ LegacyStyleInterpolation* interpolation = toLegacyStyleInterpolation(interpolationValue);
+ AnimatableValue* value = interpolation->currentValue();
ASSERT_TRUE(value->isLength() || value->isUnknown());
double actualValue;
if (value->isLength())
- actualValue = toAnimatableLength(value.get())->length(1, ValueRangeAll).value();
+ actualValue = toAnimatableLength(value)->length(1, ValueRangeAll).value();
else
- actualValue = toCSSPrimitiveValue(toAnimatableUnknown(value.get())->toCSSValue().get())->getDoubleValue();
+ actualValue = toCSSPrimitiveValue(toAnimatableUnknown(value)->toCSSValue().get())->getDoubleValue();
EXPECT_FLOAT_EQ(static_cast<float>(expectedValue), actualValue);
}
-Interpolation* findValue(WillBeHeapVector<RefPtrWillBeMember<Interpolation>>& values, CSSPropertyID id)
+Interpolation* findValue(HeapVector<Member<Interpolation>>& values, CSSPropertyID id)
{
for (auto& value : values) {
if (toLegacyStyleInterpolation(value.get())->id() == id)
@@ -101,8 +101,8 @@ Interpolation* findValue(WillBeHeapVector<RefPtrWillBeMember<Interpolation>>& va
TEST(AnimationKeyframeEffectModel, BasicOperation)
{
AnimatableValueKeyframeVector keyframes = keyframesAtZeroAndOne(unknownAnimatableValue(3.0), unknownAnimatableValue(5.0));
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 0.6, duration, values);
ASSERT_EQ(1UL, values->size());
expectProperty(CSSPropertyLeft, values->at(0));
@@ -114,8 +114,8 @@ TEST(AnimationKeyframeEffectModel, CompositeReplaceNonInterpolable)
AnimatableValueKeyframeVector keyframes = keyframesAtZeroAndOne(unknownAnimatableValue(3.0), unknownAnimatableValue(5.0));
keyframes[0]->setComposite(AnimationEffect::CompositeReplace);
keyframes[1]->setComposite(AnimationEffect::CompositeReplace);
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 0.6, duration, values);
expectDoubleValue(5.0, values->at(0));
}
@@ -125,8 +125,8 @@ TEST(AnimationKeyframeEffectModel, CompositeReplace)
AnimatableValueKeyframeVector keyframes = keyframesAtZeroAndOne(pixelAnimatableValue(3.0), pixelAnimatableValue(5.0));
keyframes[0]->setComposite(AnimationEffect::CompositeReplace);
keyframes[1]->setComposite(AnimationEffect::CompositeReplace);
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 0.6, duration, values);
expectDoubleValue(3.0 * 0.4 + 5.0 * 0.6, values->at(0));
}
@@ -137,8 +137,8 @@ TEST(AnimationKeyframeEffectModel, DISABLED_CompositeAdd)
AnimatableValueKeyframeVector keyframes = keyframesAtZeroAndOne(pixelAnimatableValue(3.0), pixelAnimatableValue(5.0));
keyframes[0]->setComposite(AnimationEffect::CompositeAdd);
keyframes[1]->setComposite(AnimationEffect::CompositeAdd);
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 0.6, duration, values);
expectDoubleValue((7.0 + 3.0) * 0.4 + (7.0 + 5.0) * 0.6, values->at(0));
}
@@ -149,8 +149,8 @@ TEST(AnimationKeyframeEffectModel, CompositeEaseIn)
keyframes[0]->setComposite(AnimationEffect::CompositeReplace);
keyframes[0]->setEasing(CubicBezierTimingFunction::preset(CubicBezierTimingFunction::EaseIn));
keyframes[1]->setComposite(AnimationEffect::CompositeReplace);
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 0.6, duration, values);
expectDoubleValue(3.8579516, values->at(0));
effect->sample(0, 0.6, duration * 100, values);
@@ -163,8 +163,8 @@ TEST(AnimationKeyframeEffectModel, CompositeCubicBezier)
keyframes[0]->setComposite(AnimationEffect::CompositeReplace);
keyframes[0]->setEasing(CubicBezierTimingFunction::create(0.42, 0, 0.58, 1));
keyframes[1]->setComposite(AnimationEffect::CompositeReplace);
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 0.6, duration, values);
expectDoubleValue(4.3363357, values->at(0));
effect->sample(0, 0.6, duration * 1000, values);
@@ -176,8 +176,8 @@ TEST(AnimationKeyframeEffectModel, ExtrapolateReplaceNonInterpolable)
AnimatableValueKeyframeVector keyframes = keyframesAtZeroAndOne(unknownAnimatableValue(3.0), unknownAnimatableValue(5.0));
keyframes[0]->setComposite(AnimationEffect::CompositeReplace);
keyframes[1]->setComposite(AnimationEffect::CompositeReplace);
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 1.6, duration, values);
expectDoubleValue(5.0, values->at(0));
}
@@ -185,10 +185,10 @@ TEST(AnimationKeyframeEffectModel, ExtrapolateReplaceNonInterpolable)
TEST(AnimationKeyframeEffectModel, ExtrapolateReplace)
{
AnimatableValueKeyframeVector keyframes = keyframesAtZeroAndOne(pixelAnimatableValue(3.0), pixelAnimatableValue(5.0));
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
keyframes[0]->setComposite(AnimationEffect::CompositeReplace);
keyframes[1]->setComposite(AnimationEffect::CompositeReplace);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 1.6, duration, values);
expectDoubleValue(3.0 * -0.6 + 5.0 * 1.6, values->at(0));
}
@@ -199,16 +199,16 @@ TEST(AnimationKeyframeEffectModel, DISABLED_ExtrapolateAdd)
AnimatableValueKeyframeVector keyframes = keyframesAtZeroAndOne(pixelAnimatableValue(3.0), pixelAnimatableValue(5.0));
keyframes[0]->setComposite(AnimationEffect::CompositeAdd);
keyframes[1]->setComposite(AnimationEffect::CompositeAdd);
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 1.6, duration, values);
expectDoubleValue((7.0 + 3.0) * -0.6 + (7.0 + 5.0) * 1.6, values->at(0));
}
TEST(AnimationKeyframeEffectModel, ZeroKeyframes)
{
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector());
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(AnimatableValueKeyframeVector());
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 0.5, duration, values);
EXPECT_TRUE(values->isEmpty());
}
@@ -219,10 +219,10 @@ TEST(AnimationKeyframeEffectModel, DISABLED_SingleKeyframeAtOffsetZero)
AnimatableValueKeyframeVector keyframes(1);
keyframes[0] = AnimatableValueKeyframe::create();
keyframes[0]->setOffset(0.0);
- keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0).get());
+ keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0));
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 0.6, duration, values);
expectDoubleValue(3.0, values->at(0));
}
@@ -233,10 +233,10 @@ TEST(AnimationKeyframeEffectModel, DISABLED_SingleKeyframeAtOffsetOne)
AnimatableValueKeyframeVector keyframes(1);
keyframes[0] = AnimatableValueKeyframe::create();
keyframes[0]->setOffset(1.0);
- keyframes[0]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(5.0).get());
+ keyframes[0]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(5.0));
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 0.6, duration, values);
expectDoubleValue(7.0 * 0.4 + 5.0 * 0.6, values->at(0));
}
@@ -246,16 +246,16 @@ TEST(AnimationKeyframeEffectModel, MoreThanTwoKeyframes)
AnimatableValueKeyframeVector keyframes(3);
keyframes[0] = AnimatableValueKeyframe::create();
keyframes[0]->setOffset(0.0);
- keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0).get());
+ keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0));
keyframes[1] = AnimatableValueKeyframe::create();
keyframes[1]->setOffset(0.5);
- keyframes[1]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(4.0).get());
+ keyframes[1]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(4.0));
keyframes[2] = AnimatableValueKeyframe::create();
keyframes[2]->setOffset(1.0);
- keyframes[2]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(5.0).get());
+ keyframes[2]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(5.0));
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 0.3, duration, values);
expectDoubleValue(4.0, values->at(0));
effect->sample(0, 0.8, duration, values);
@@ -266,15 +266,15 @@ TEST(AnimationKeyframeEffectModel, EndKeyframeOffsetsUnspecified)
{
AnimatableValueKeyframeVector keyframes(3);
keyframes[0] = AnimatableValueKeyframe::create();
- keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0).get());
+ keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0));
keyframes[1] = AnimatableValueKeyframe::create();
keyframes[1]->setOffset(0.5);
- keyframes[1]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(4.0).get());
+ keyframes[1]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(4.0));
keyframes[2] = AnimatableValueKeyframe::create();
- keyframes[2]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(5.0).get());
+ keyframes[2]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(5.0));
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 0.1, duration, values);
expectDoubleValue(3.0, values->at(0));
effect->sample(0, 0.6, duration, values);
@@ -288,16 +288,16 @@ TEST(AnimationKeyframeEffectModel, SampleOnKeyframe)
AnimatableValueKeyframeVector keyframes(3);
keyframes[0] = AnimatableValueKeyframe::create();
keyframes[0]->setOffset(0.0);
- keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0).get());
+ keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0));
keyframes[1] = AnimatableValueKeyframe::create();
keyframes[1]->setOffset(0.5);
- keyframes[1]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(4.0).get());
+ keyframes[1]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(4.0));
keyframes[2] = AnimatableValueKeyframe::create();
keyframes[2]->setOffset(1.0);
- keyframes[2]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(5.0).get());
+ keyframes[2]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(5.0));
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 0.0, duration, values);
expectDoubleValue(3.0, values->at(0));
effect->sample(0, 0.5, duration, values);
@@ -311,34 +311,34 @@ TEST(AnimationKeyframeEffectModel, MultipleKeyframesWithSameOffset)
AnimatableValueKeyframeVector keyframes(9);
keyframes[0] = AnimatableValueKeyframe::create();
keyframes[0]->setOffset(0.0);
- keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(0.0).get());
+ keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(0.0));
keyframes[1] = AnimatableValueKeyframe::create();
keyframes[1]->setOffset(0.1);
- keyframes[1]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(1.0).get());
+ keyframes[1]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(1.0));
keyframes[2] = AnimatableValueKeyframe::create();
keyframes[2]->setOffset(0.1);
- keyframes[2]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(2.0).get());
+ keyframes[2]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(2.0));
keyframes[3] = AnimatableValueKeyframe::create();
keyframes[3]->setOffset(0.5);
- keyframes[3]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0).get());
+ keyframes[3]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0));
keyframes[4] = AnimatableValueKeyframe::create();
keyframes[4]->setOffset(0.5);
- keyframes[4]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(4.0).get());
+ keyframes[4]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(4.0));
keyframes[5] = AnimatableValueKeyframe::create();
keyframes[5]->setOffset(0.5);
- keyframes[5]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(5.0).get());
+ keyframes[5]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(5.0));
keyframes[6] = AnimatableValueKeyframe::create();
keyframes[6]->setOffset(0.9);
- keyframes[6]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(6.0).get());
+ keyframes[6]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(6.0));
keyframes[7] = AnimatableValueKeyframe::create();
keyframes[7]->setOffset(0.9);
- keyframes[7]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(7.0).get());
+ keyframes[7]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(7.0));
keyframes[8] = AnimatableValueKeyframe::create();
keyframes[8]->setOffset(1.0);
- keyframes[8]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(7.0).get());
+ keyframes[8]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(7.0));
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 0.0, duration, values);
expectDoubleValue(0.0, values->at(0));
effect->sample(0, 0.2, duration, values);
@@ -361,14 +361,14 @@ TEST(AnimationKeyframeEffectModel, DISABLED_PerKeyframeComposite)
AnimatableValueKeyframeVector keyframes(2);
keyframes[0] = AnimatableValueKeyframe::create();
keyframes[0]->setOffset(0.0);
- keyframes[0]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(3.0).get());
+ keyframes[0]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(3.0));
keyframes[1] = AnimatableValueKeyframe::create();
keyframes[1]->setOffset(1.0);
- keyframes[1]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(5.0).get());
+ keyframes[1]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(5.0));
keyframes[1]->setComposite(AnimationEffect::CompositeAdd);
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 0.6, duration, values);
expectDoubleValue(3.0 * 0.4 + (7.0 + 5.0) * 0.6, values->at(0));
}
@@ -378,21 +378,21 @@ TEST(AnimationKeyframeEffectModel, MultipleProperties)
AnimatableValueKeyframeVector keyframes(2);
keyframes[0] = AnimatableValueKeyframe::create();
keyframes[0]->setOffset(0.0);
- keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0).get());
- keyframes[0]->setPropertyValue(CSSPropertyRight, unknownAnimatableValue(4.0).get());
+ keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(3.0));
+ keyframes[0]->setPropertyValue(CSSPropertyRight, unknownAnimatableValue(4.0));
keyframes[1] = AnimatableValueKeyframe::create();
keyframes[1]->setOffset(1.0);
- keyframes[1]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(5.0).get());
- keyframes[1]->setPropertyValue(CSSPropertyRight, unknownAnimatableValue(6.0).get());
+ keyframes[1]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(5.0));
+ keyframes[1]->setPropertyValue(CSSPropertyRight, unknownAnimatableValue(6.0));
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 0.6, duration, values);
EXPECT_EQ(2UL, values->size());
- Interpolation* leftValue = findValue(*values.get(), CSSPropertyLeft);
+ Interpolation* leftValue = findValue(*values, CSSPropertyLeft);
ASSERT_TRUE(leftValue);
expectDoubleValue(5.0, leftValue);
- Interpolation* rightValue = findValue(*values.get(), CSSPropertyRight);
+ Interpolation* rightValue = findValue(*values, CSSPropertyRight);
ASSERT_TRUE(rightValue);
expectDoubleValue(6.0, rightValue);
}
@@ -403,8 +403,8 @@ TEST(AnimationKeyframeEffectModel, DISABLED_RecompositeCompositableValue)
AnimatableValueKeyframeVector keyframes = keyframesAtZeroAndOne(pixelAnimatableValue(3.0), pixelAnimatableValue(5.0));
keyframes[0]->setComposite(AnimationEffect::CompositeAdd);
keyframes[1]->setComposite(AnimationEffect::CompositeAdd);
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 0.6, duration, values);
expectDoubleValue((7.0 + 3.0) * 0.4 + (7.0 + 5.0) * 0.6, values->at(0));
expectDoubleValue((9.0 + 3.0) * 0.4 + (9.0 + 5.0) * 0.6, values->at(0));
@@ -413,8 +413,8 @@ TEST(AnimationKeyframeEffectModel, DISABLED_RecompositeCompositableValue)
TEST(AnimationKeyframeEffectModel, MultipleIterations)
{
AnimatableValueKeyframeVector keyframes = keyframesAtZeroAndOne(pixelAnimatableValue(1.0), pixelAnimatableValue(3.0));
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 0.5, duration, values);
expectDoubleValue(2.0, values->at(0));
effect->sample(1, 0.5, duration, values);
@@ -429,17 +429,17 @@ TEST(AnimationKeyframeEffectModel, DISABLED_DependsOnUnderlyingValue)
AnimatableValueKeyframeVector keyframes(3);
keyframes[0] = AnimatableValueKeyframe::create();
keyframes[0]->setOffset(0.0);
- keyframes[0]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(1.0).get());
+ keyframes[0]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(1.0));
keyframes[0]->setComposite(AnimationEffect::CompositeAdd);
keyframes[1] = AnimatableValueKeyframe::create();
keyframes[1]->setOffset(0.5);
- keyframes[1]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(1.0).get());
+ keyframes[1]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(1.0));
keyframes[2] = AnimatableValueKeyframe::create();
keyframes[2]->setOffset(1.0);
- keyframes[2]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(1.0).get());
+ keyframes[2]->setPropertyValue(CSSPropertyLeft, pixelAnimatableValue(1.0));
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> values = nullptr;
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ HeapVector<Member<Interpolation>>* values = nullptr;
effect->sample(0, 0, duration, values);
EXPECT_TRUE(values->at(0));
effect->sample(0, 0.1, duration, values);
@@ -465,9 +465,9 @@ TEST(AnimationKeyframeEffectModel, AddSyntheticKeyframes)
AnimatableValueKeyframeVector keyframes(1);
keyframes[0] = AnimatableValueKeyframe::create();
keyframes[0]->setOffset(0.5);
- keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(4.0).get());
+ keyframes[0]->setPropertyValue(CSSPropertyLeft, unknownAnimatableValue(4.0));
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
const AnimatableValuePropertySpecificKeyframeVector& propertySpecificKeyframes = effect->getPropertySpecificKeyframes(PropertyHandle(CSSPropertyLeft));
EXPECT_EQ(3U, propertySpecificKeyframes.size());
EXPECT_DOUBLE_EQ(0.0, propertySpecificKeyframes[0]->offset());
@@ -478,9 +478,9 @@ TEST(AnimationKeyframeEffectModel, AddSyntheticKeyframes)
TEST(AnimationKeyframeEffectModel, ToKeyframeEffectModel)
{
AnimatableValueKeyframeVector keyframes(0);
- RefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> effect = AnimatableValueKeyframeEffectModel::create(keyframes);
+ AnimatableValueKeyframeEffectModel* effect = AnimatableValueKeyframeEffectModel::create(keyframes);
- AnimationEffect* baseEffect = effect.get();
+ AnimationEffect* baseEffect = effect;
EXPECT_TRUE(toAnimatableValueKeyframeEffectModel(baseEffect));
}
« Source/core/animation/ElementAnimations.cpp ('K') | « Source/core/animation/KeyframeEffectModel.cpp ('k') | Source/core/animation/LegacyStyleInterpolation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698