| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "core/animation/InterpolableValue.h" | 5 #include "core/animation/InterpolableValue.h" |
| 6 | 6 |
| 7 #include "core/animation/Interpolation.h" | 7 #include "core/animation/Interpolation.h" |
| 8 #include "core/animation/PropertyHandle.h" | 8 #include "core/animation/PropertyHandle.h" |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 10 #include <memory> |
| 10 | 11 |
| 11 namespace blink { | 12 namespace blink { |
| 12 | 13 |
| 13 namespace { | 14 namespace { |
| 14 | 15 |
| 15 class SampleInterpolation : public Interpolation { | 16 class SampleInterpolation : public Interpolation { |
| 16 public: | 17 public: |
| 17 static PassRefPtr<Interpolation> create(PassOwnPtr<InterpolableValue> start,
PassOwnPtr<InterpolableValue> end) | 18 static PassRefPtr<Interpolation> create(std::unique_ptr<InterpolableValue> s
tart, std::unique_ptr<InterpolableValue> end) |
| 18 { | 19 { |
| 19 return adoptRef(new SampleInterpolation(std::move(start), std::move(end)
)); | 20 return adoptRef(new SampleInterpolation(std::move(start), std::move(end)
)); |
| 20 } | 21 } |
| 21 | 22 |
| 22 PropertyHandle getProperty() const override | 23 PropertyHandle getProperty() const override |
| 23 { | 24 { |
| 24 return PropertyHandle(CSSPropertyBackgroundColor); | 25 return PropertyHandle(CSSPropertyBackgroundColor); |
| 25 } | 26 } |
| 26 private: | 27 private: |
| 27 SampleInterpolation(PassOwnPtr<InterpolableValue> start, PassOwnPtr<Interpol
ableValue> end) | 28 SampleInterpolation(std::unique_ptr<InterpolableValue> start, std::unique_pt
r<InterpolableValue> end) |
| 28 : Interpolation(std::move(start), std::move(end)) | 29 : Interpolation(std::move(start), std::move(end)) |
| 29 { | 30 { |
| 30 } | 31 } |
| 31 }; | 32 }; |
| 32 | 33 |
| 33 } // namespace | 34 } // namespace |
| 34 | 35 |
| 35 class AnimationInterpolableValueTest : public ::testing::Test { | 36 class AnimationInterpolableValueTest : public ::testing::Test { |
| 36 protected: | 37 protected: |
| 37 InterpolableValue* interpolationValue(Interpolation& interpolation) | 38 InterpolableValue* interpolationValue(Interpolation& interpolation) |
| (...skipping 13 matching lines...) Expand all Loading... |
| 51 RefPtr<Interpolation> i = SampleInterpolation::create(InterpolableBool::
create(a), InterpolableBool::create(b)); | 52 RefPtr<Interpolation> i = SampleInterpolation::create(InterpolableBool::
create(a), InterpolableBool::create(b)); |
| 52 i->interpolate(0, progress); | 53 i->interpolate(0, progress); |
| 53 return toInterpolableBool(interpolationValue(*i.get()))->value(); | 54 return toInterpolableBool(interpolationValue(*i.get()))->value(); |
| 54 } | 55 } |
| 55 | 56 |
| 56 void scaleAndAdd(InterpolableValue& base, double scale, const InterpolableVa
lue& add) | 57 void scaleAndAdd(InterpolableValue& base, double scale, const InterpolableVa
lue& add) |
| 57 { | 58 { |
| 58 base.scaleAndAdd(scale, add); | 59 base.scaleAndAdd(scale, add); |
| 59 } | 60 } |
| 60 | 61 |
| 61 PassRefPtr<Interpolation> interpolateLists(PassOwnPtr<InterpolableList> list
A, PassOwnPtr<InterpolableList> listB, double progress) | 62 PassRefPtr<Interpolation> interpolateLists(std::unique_ptr<InterpolableList>
listA, std::unique_ptr<InterpolableList> listB, double progress) |
| 62 { | 63 { |
| 63 RefPtr<Interpolation> i = SampleInterpolation::create(std::move(listA),
std::move(listB)); | 64 RefPtr<Interpolation> i = SampleInterpolation::create(std::move(listA),
std::move(listB)); |
| 64 i->interpolate(0, progress); | 65 i->interpolate(0, progress); |
| 65 return i; | 66 return i; |
| 66 } | 67 } |
| 67 }; | 68 }; |
| 68 | 69 |
| 69 TEST_F(AnimationInterpolableValueTest, InterpolateNumbers) | 70 TEST_F(AnimationInterpolableValueTest, InterpolateNumbers) |
| 70 { | 71 { |
| 71 EXPECT_FLOAT_EQ(126, interpolateNumbers(42, 0, -2)); | 72 EXPECT_FLOAT_EQ(126, interpolateNumbers(42, 0, -2)); |
| 72 EXPECT_FLOAT_EQ(42, interpolateNumbers(42, 0, 0)); | 73 EXPECT_FLOAT_EQ(42, interpolateNumbers(42, 0, 0)); |
| 73 EXPECT_FLOAT_EQ(29.4f, interpolateNumbers(42, 0, 0.3)); | 74 EXPECT_FLOAT_EQ(29.4f, interpolateNumbers(42, 0, 0.3)); |
| 74 EXPECT_FLOAT_EQ(21, interpolateNumbers(42, 0, 0.5)); | 75 EXPECT_FLOAT_EQ(21, interpolateNumbers(42, 0, 0.5)); |
| 75 EXPECT_FLOAT_EQ(0, interpolateNumbers(42, 0, 1)); | 76 EXPECT_FLOAT_EQ(0, interpolateNumbers(42, 0, 1)); |
| 76 EXPECT_FLOAT_EQ(-21, interpolateNumbers(42, 0, 1.5)); | 77 EXPECT_FLOAT_EQ(-21, interpolateNumbers(42, 0, 1.5)); |
| 77 } | 78 } |
| 78 | 79 |
| 79 TEST_F(AnimationInterpolableValueTest, InterpolateBools) | 80 TEST_F(AnimationInterpolableValueTest, InterpolateBools) |
| 80 { | 81 { |
| 81 EXPECT_FALSE(interpolateBools(false, true, -1)); | 82 EXPECT_FALSE(interpolateBools(false, true, -1)); |
| 82 EXPECT_FALSE(interpolateBools(false, true, 0)); | 83 EXPECT_FALSE(interpolateBools(false, true, 0)); |
| 83 EXPECT_FALSE(interpolateBools(false, true, 0.3)); | 84 EXPECT_FALSE(interpolateBools(false, true, 0.3)); |
| 84 EXPECT_TRUE(interpolateBools(false, true, 0.5)); | 85 EXPECT_TRUE(interpolateBools(false, true, 0.5)); |
| 85 EXPECT_TRUE(interpolateBools(false, true, 1)); | 86 EXPECT_TRUE(interpolateBools(false, true, 1)); |
| 86 EXPECT_TRUE(interpolateBools(false, true, 2)); | 87 EXPECT_TRUE(interpolateBools(false, true, 2)); |
| 87 } | 88 } |
| 88 | 89 |
| 89 TEST_F(AnimationInterpolableValueTest, SimpleList) | 90 TEST_F(AnimationInterpolableValueTest, SimpleList) |
| 90 { | 91 { |
| 91 OwnPtr<InterpolableList> listA = InterpolableList::create(3); | 92 std::unique_ptr<InterpolableList> listA = InterpolableList::create(3); |
| 92 listA->set(0, InterpolableNumber::create(0)); | 93 listA->set(0, InterpolableNumber::create(0)); |
| 93 listA->set(1, InterpolableNumber::create(42)); | 94 listA->set(1, InterpolableNumber::create(42)); |
| 94 listA->set(2, InterpolableNumber::create(20.5)); | 95 listA->set(2, InterpolableNumber::create(20.5)); |
| 95 | 96 |
| 96 OwnPtr<InterpolableList> listB = InterpolableList::create(3); | 97 std::unique_ptr<InterpolableList> listB = InterpolableList::create(3); |
| 97 listB->set(0, InterpolableNumber::create(100)); | 98 listB->set(0, InterpolableNumber::create(100)); |
| 98 listB->set(1, InterpolableNumber::create(-200)); | 99 listB->set(1, InterpolableNumber::create(-200)); |
| 99 listB->set(2, InterpolableNumber::create(300)); | 100 listB->set(2, InterpolableNumber::create(300)); |
| 100 | 101 |
| 101 RefPtr<Interpolation> i = interpolateLists(std::move(listA), std::move(listB
), 0.3); | 102 RefPtr<Interpolation> i = interpolateLists(std::move(listA), std::move(listB
), 0.3); |
| 102 InterpolableList* outList = toInterpolableList(interpolationValue(*i.get()))
; | 103 InterpolableList* outList = toInterpolableList(interpolationValue(*i.get()))
; |
| 103 EXPECT_FLOAT_EQ(30, toInterpolableNumber(outList->get(0))->value()); | 104 EXPECT_FLOAT_EQ(30, toInterpolableNumber(outList->get(0))->value()); |
| 104 EXPECT_FLOAT_EQ(-30.6f, toInterpolableNumber(outList->get(1))->value()); | 105 EXPECT_FLOAT_EQ(-30.6f, toInterpolableNumber(outList->get(1))->value()); |
| 105 EXPECT_FLOAT_EQ(104.35f, toInterpolableNumber(outList->get(2))->value()); | 106 EXPECT_FLOAT_EQ(104.35f, toInterpolableNumber(outList->get(2))->value()); |
| 106 } | 107 } |
| 107 | 108 |
| 108 TEST_F(AnimationInterpolableValueTest, NestedList) | 109 TEST_F(AnimationInterpolableValueTest, NestedList) |
| 109 { | 110 { |
| 110 OwnPtr<InterpolableList> listA = InterpolableList::create(3); | 111 std::unique_ptr<InterpolableList> listA = InterpolableList::create(3); |
| 111 listA->set(0, InterpolableNumber::create(0)); | 112 listA->set(0, InterpolableNumber::create(0)); |
| 112 OwnPtr<InterpolableList> subListA = InterpolableList::create(1); | 113 std::unique_ptr<InterpolableList> subListA = InterpolableList::create(1); |
| 113 subListA->set(0, InterpolableNumber::create(100)); | 114 subListA->set(0, InterpolableNumber::create(100)); |
| 114 listA->set(1, std::move(subListA)); | 115 listA->set(1, std::move(subListA)); |
| 115 listA->set(2, InterpolableBool::create(false)); | 116 listA->set(2, InterpolableBool::create(false)); |
| 116 | 117 |
| 117 OwnPtr<InterpolableList> listB = InterpolableList::create(3); | 118 std::unique_ptr<InterpolableList> listB = InterpolableList::create(3); |
| 118 listB->set(0, InterpolableNumber::create(100)); | 119 listB->set(0, InterpolableNumber::create(100)); |
| 119 OwnPtr<InterpolableList> subListB = InterpolableList::create(1); | 120 std::unique_ptr<InterpolableList> subListB = InterpolableList::create(1); |
| 120 subListB->set(0, InterpolableNumber::create(50)); | 121 subListB->set(0, InterpolableNumber::create(50)); |
| 121 listB->set(1, std::move(subListB)); | 122 listB->set(1, std::move(subListB)); |
| 122 listB->set(2, InterpolableBool::create(true)); | 123 listB->set(2, InterpolableBool::create(true)); |
| 123 | 124 |
| 124 RefPtr<Interpolation> i = interpolateLists(std::move(listA), std::move(listB
), 0.5); | 125 RefPtr<Interpolation> i = interpolateLists(std::move(listA), std::move(listB
), 0.5); |
| 125 InterpolableList* outList = toInterpolableList(interpolationValue(*i.get()))
; | 126 InterpolableList* outList = toInterpolableList(interpolationValue(*i.get()))
; |
| 126 EXPECT_FLOAT_EQ(50, toInterpolableNumber(outList->get(0))->value()); | 127 EXPECT_FLOAT_EQ(50, toInterpolableNumber(outList->get(0))->value()); |
| 127 EXPECT_FLOAT_EQ(75, toInterpolableNumber(toInterpolableList(outList->get(1))
->get(0))->value()); | 128 EXPECT_FLOAT_EQ(75, toInterpolableNumber(toInterpolableList(outList->get(1))
->get(0))->value()); |
| 128 EXPECT_TRUE(toInterpolableBool(outList->get(2))->value()); | 129 EXPECT_TRUE(toInterpolableBool(outList->get(2))->value()); |
| 129 } | 130 } |
| 130 | 131 |
| 131 TEST_F(AnimationInterpolableValueTest, ScaleAndAddNumbers) | 132 TEST_F(AnimationInterpolableValueTest, ScaleAndAddNumbers) |
| 132 { | 133 { |
| 133 OwnPtr<InterpolableNumber> base = InterpolableNumber::create(10); | 134 std::unique_ptr<InterpolableNumber> base = InterpolableNumber::create(10); |
| 134 scaleAndAdd(*base, 2, *InterpolableNumber::create(1)); | 135 scaleAndAdd(*base, 2, *InterpolableNumber::create(1)); |
| 135 EXPECT_FLOAT_EQ(21, base->value()); | 136 EXPECT_FLOAT_EQ(21, base->value()); |
| 136 | 137 |
| 137 base = InterpolableNumber::create(10); | 138 base = InterpolableNumber::create(10); |
| 138 scaleAndAdd(*base, 0, *InterpolableNumber::create(5)); | 139 scaleAndAdd(*base, 0, *InterpolableNumber::create(5)); |
| 139 EXPECT_FLOAT_EQ(5, base->value()); | 140 EXPECT_FLOAT_EQ(5, base->value()); |
| 140 | 141 |
| 141 base = InterpolableNumber::create(10); | 142 base = InterpolableNumber::create(10); |
| 142 scaleAndAdd(*base, -1, *InterpolableNumber::create(8)); | 143 scaleAndAdd(*base, -1, *InterpolableNumber::create(8)); |
| 143 EXPECT_FLOAT_EQ(-2, base->value()); | 144 EXPECT_FLOAT_EQ(-2, base->value()); |
| 144 } | 145 } |
| 145 | 146 |
| 146 TEST_F(AnimationInterpolableValueTest, ScaleAndAddLists) | 147 TEST_F(AnimationInterpolableValueTest, ScaleAndAddLists) |
| 147 { | 148 { |
| 148 OwnPtr<InterpolableList> baseList = InterpolableList::create(3); | 149 std::unique_ptr<InterpolableList> baseList = InterpolableList::create(3); |
| 149 baseList->set(0, InterpolableNumber::create(5)); | 150 baseList->set(0, InterpolableNumber::create(5)); |
| 150 baseList->set(1, InterpolableNumber::create(10)); | 151 baseList->set(1, InterpolableNumber::create(10)); |
| 151 baseList->set(2, InterpolableNumber::create(15)); | 152 baseList->set(2, InterpolableNumber::create(15)); |
| 152 OwnPtr<InterpolableList> addList = InterpolableList::create(3); | 153 std::unique_ptr<InterpolableList> addList = InterpolableList::create(3); |
| 153 addList->set(0, InterpolableNumber::create(1)); | 154 addList->set(0, InterpolableNumber::create(1)); |
| 154 addList->set(1, InterpolableNumber::create(2)); | 155 addList->set(1, InterpolableNumber::create(2)); |
| 155 addList->set(2, InterpolableNumber::create(3)); | 156 addList->set(2, InterpolableNumber::create(3)); |
| 156 scaleAndAdd(*baseList, 2, *addList); | 157 scaleAndAdd(*baseList, 2, *addList); |
| 157 EXPECT_FLOAT_EQ(11, toInterpolableNumber(baseList->get(0))->value()); | 158 EXPECT_FLOAT_EQ(11, toInterpolableNumber(baseList->get(0))->value()); |
| 158 EXPECT_FLOAT_EQ(22, toInterpolableNumber(baseList->get(1))->value()); | 159 EXPECT_FLOAT_EQ(22, toInterpolableNumber(baseList->get(1))->value()); |
| 159 EXPECT_FLOAT_EQ(33, toInterpolableNumber(baseList->get(2))->value()); | 160 EXPECT_FLOAT_EQ(33, toInterpolableNumber(baseList->get(2))->value()); |
| 160 } | 161 } |
| 161 | 162 |
| 162 } // namespace blink | 163 } // namespace blink |
| OLD | NEW |