| 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 "config.h" | 5 #include "config.h" |
| 6 #include "core/animation/DoubleStyleInterpolation.h" | 6 #include "core/animation/DoubleStyleInterpolation.h" |
| 7 | 7 |
| 8 #include "core/css/CSSPrimitiveValue.h" | 8 #include "core/css/CSSPrimitiveValue.h" |
| 9 #include "core/css/CSSValueList.h" | 9 #include "core/css/CSSValueList.h" |
| 10 #include "core/css/StylePropertySet.h" | 10 #include "core/css/StylePropertySet.h" |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 } | 74 } |
| 75 | 75 |
| 76 static InterpolableValue* getCachedValue(Interpolation& interpolation) | 76 static InterpolableValue* getCachedValue(Interpolation& interpolation) |
| 77 { | 77 { |
| 78 return interpolation.getCachedValueForTesting(); | 78 return interpolation.getCachedValueForTesting(); |
| 79 } | 79 } |
| 80 }; | 80 }; |
| 81 | 81 |
| 82 TEST_F(AnimationDoubleStyleInterpolationTest, ZeroValue) | 82 TEST_F(AnimationDoubleStyleInterpolationTest, ZeroValue) |
| 83 { | 83 { |
| 84 CSSValue value = roundTrip(CSSPrimitiveValue::create(0, CSSPrimitiveValue::C
SS_NUMBER)); | 84 const CSSValue& value = roundTrip(CSSPrimitiveValue::create(0, CSSPrimitiveV
alue::CSS_NUMBER)); |
| 85 testPrimitiveValue(value, 0, CSSPrimitiveValue::CSS_NUMBER); | 85 testPrimitiveValue(value, 0, CSSPrimitiveValue::CSS_NUMBER); |
| 86 } | 86 } |
| 87 | 87 |
| 88 TEST_F(AnimationDoubleStyleInterpolationTest, AngleValue) | 88 TEST_F(AnimationDoubleStyleInterpolationTest, AngleValue) |
| 89 { | 89 { |
| 90 CSSValue value = roundTrip(CSSPrimitiveValue::create(10, CSSPrimitiveValue::
CSS_DEG)); | 90 CSSValue value = roundTrip(CSSPrimitiveValue::create(10, CSSPrimitiveValue::
CSS_DEG)); |
| 91 testPrimitiveValue(value, 10, CSSPrimitiveValue::CSS_DEG); | 91 testPrimitiveValue(value, 10, CSSPrimitiveValue::CSS_DEG); |
| 92 | 92 |
| 93 value = roundTrip(CSSPrimitiveValue::create(10, CSSPrimitiveValue::CSS_RAD))
; | 93 value = roundTrip(CSSPrimitiveValue::create(10, CSSPrimitiveValue::CSS_RAD))
; |
| 94 testPrimitiveValue(value, rad2deg(10.0), CSSPrimitiveValue::CSS_DEG); | 94 testPrimitiveValue(value, rad2deg(10.0), CSSPrimitiveValue::CSS_DEG); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 107 RangeAll); | 107 RangeAll); |
| 108 interpolableDouble->interpolate(0, 0.4); | 108 interpolableDouble->interpolate(0, 0.4); |
| 109 // progVal = start*(1-prog) + end*prog | 109 // progVal = start*(1-prog) + end*prog |
| 110 EXPECT_EQ(0.24, toInterpolableNumber(getCachedValue(*interpolableDouble))->v
alue()); | 110 EXPECT_EQ(0.24, toInterpolableNumber(getCachedValue(*interpolableDouble))->v
alue()); |
| 111 } | 111 } |
| 112 | 112 |
| 113 TEST_F(AnimationDoubleStyleInterpolationTest, ZeroValueFixedMotionRotation) | 113 TEST_F(AnimationDoubleStyleInterpolationTest, ZeroValueFixedMotionRotation) |
| 114 { | 114 { |
| 115 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated()
; | 115 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated()
; |
| 116 list->append(CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_DEG)); | 116 list->append(CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_DEG)); |
| 117 CSSValue value = roundTripMotionRotation(list.release(), false); | 117 const CSSValue& value = roundTripMotionRotation(list.release(), false); |
| 118 testValueListMotionRotation(value, 0, false); | 118 testValueListMotionRotation(value, 0, false); |
| 119 } | 119 } |
| 120 | 120 |
| 121 TEST_F(AnimationDoubleStyleInterpolationTest, ZeroValueAutoMotionRotation) | 121 TEST_F(AnimationDoubleStyleInterpolationTest, ZeroValueAutoMotionRotation) |
| 122 { | 122 { |
| 123 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated()
; | 123 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated()
; |
| 124 list->append(CSSPrimitiveValue::createIdentifier(CSSValueAuto)); | 124 list->append(CSSPrimitiveValue::createIdentifier(CSSValueAuto)); |
| 125 list->append(CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_DEG)); | 125 list->append(CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_DEG)); |
| 126 CSSValue value = roundTripMotionRotation(list.release(), true); | 126 const CSSValue& value = roundTripMotionRotation(list.release(), true); |
| 127 testValueListMotionRotation(value, 0, true); | 127 testValueListMotionRotation(value, 0, true); |
| 128 } | 128 } |
| 129 | 129 |
| 130 TEST_F(AnimationDoubleStyleInterpolationTest, ValueFixedMotionRotation) | 130 TEST_F(AnimationDoubleStyleInterpolationTest, ValueFixedMotionRotation) |
| 131 { | 131 { |
| 132 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated()
; | 132 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated()
; |
| 133 list->append(CSSPrimitiveValue::create(90, CSSPrimitiveValue::CSS_DEG)); | 133 list->append(CSSPrimitiveValue::create(90, CSSPrimitiveValue::CSS_DEG)); |
| 134 CSSValue value = roundTripMotionRotation(list.release(), false); | 134 const CSSValue& value = roundTripMotionRotation(list.release(), false); |
| 135 testValueListMotionRotation(value, 90, false); | 135 testValueListMotionRotation(value, 90, false); |
| 136 } | 136 } |
| 137 | 137 |
| 138 TEST_F(AnimationDoubleStyleInterpolationTest, ValueAutoMotionRotation) | 138 TEST_F(AnimationDoubleStyleInterpolationTest, ValueAutoMotionRotation) |
| 139 { | 139 { |
| 140 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated()
; | 140 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated()
; |
| 141 list->append(CSSPrimitiveValue::createIdentifier(CSSValueAuto)); | 141 list->append(CSSPrimitiveValue::createIdentifier(CSSValueAuto)); |
| 142 list->append(CSSPrimitiveValue::create(90, CSSPrimitiveValue::CSS_DEG)); | 142 list->append(CSSPrimitiveValue::create(90, CSSPrimitiveValue::CSS_DEG)); |
| 143 CSSValue value = roundTripMotionRotation(list.release(), true); | 143 const CSSValue& value = roundTripMotionRotation(list.release(), true); |
| 144 testValueListMotionRotation(value, 90, true); | 144 testValueListMotionRotation(value, 90, true); |
| 145 } | 145 } |
| 146 | 146 |
| 147 } | 147 } |
| OLD | NEW |