| 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/interpolation/LengthStyleInterpolation.h" | 6 #include "core/animation/interpolation/LengthStyleInterpolation.h" |
| 7 | 7 |
| 8 #include "core/css/CSSPrimitiveValue.h" | 8 #include "core/css/CSSPrimitiveValue.h" |
| 9 #include "core/css/StylePropertySet.h" | 9 #include "core/css/StylePropertySet.h" |
| 10 | 10 |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 void initLengthArray(CSSLengthArray& lengthArray) | 56 void initLengthArray(CSSLengthArray& lengthArray) |
| 57 { | 57 { |
| 58 lengthArray.resize(CSSPrimitiveValue::LengthUnitTypeCount); | 58 lengthArray.resize(CSSPrimitiveValue::LengthUnitTypeCount); |
| 59 for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; ++i) | 59 for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; ++i) |
| 60 lengthArray.at(i) = 0; | 60 lengthArray.at(i) = 0; |
| 61 } | 61 } |
| 62 | 62 |
| 63 CSSLengthArray& setLengthArray(CSSLengthArray& lengthArray, String text) | 63 CSSLengthArray& setLengthArray(CSSLengthArray& lengthArray, String text) |
| 64 { | 64 { |
| 65 initLengthArray(lengthArray); | 65 initLengthArray(lengthArray); |
| 66 RefPtr<MutableStylePropertySet> propertySet = MutableStylePropertySet::c
reate(); | 66 RefPtrWillBeRawPtr<MutableStylePropertySet> propertySet = MutableStylePr
opertySet::create(); |
| 67 propertySet->setProperty(CSSPropertyLeft, text); | 67 propertySet->setProperty(CSSPropertyLeft, text); |
| 68 toCSSPrimitiveValue(propertySet->getPropertyCSSValue(CSSPropertyLeft).ge
t())->accumulateLengthArray(lengthArray); | 68 toCSSPrimitiveValue(propertySet->getPropertyCSSValue(CSSPropertyLeft).ge
t())->accumulateLengthArray(lengthArray); |
| 69 return lengthArray; | 69 return lengthArray; |
| 70 } | 70 } |
| 71 | 71 |
| 72 bool lengthArraysEqual(CSSLengthArray& a, CSSLengthArray& b) | 72 bool lengthArraysEqual(CSSLengthArray& a, CSSLengthArray& b) |
| 73 { | 73 { |
| 74 for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; ++i) { | 74 for (size_t i = 0; i < CSSPrimitiveValue::LengthUnitTypeCount; ++i) { |
| 75 if (a.at(i) != b.at(i)) | 75 if (a.at(i) != b.at(i)) |
| 76 return false; | 76 return false; |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 TEST_F(AnimationLengthStyleInterpolationTest, MultipleUnits) | 110 TEST_F(AnimationLengthStyleInterpolationTest, MultipleUnits) |
| 111 { | 111 { |
| 112 CSSLengthArray actual, expectation; | 112 CSSLengthArray actual, expectation; |
| 113 initLengthArray(expectation); | 113 initLengthArray(expectation); |
| 114 OwnPtrWillBeRawPtr<InterpolableList> list = createInterpolableLength(0, 10,
0, 10, 0, 10, 0, 10, 0, 10); | 114 OwnPtrWillBeRawPtr<InterpolableList> list = createInterpolableLength(0, 10,
0, 10, 0, 10, 0, 10, 0, 10); |
| 115 toCSSPrimitiveValue(interpolableValueToLength(list.get(), ValueRangeAll).get
())->accumulateLengthArray(expectation); | 115 toCSSPrimitiveValue(interpolableValueToLength(list.get(), ValueRangeAll).get
())->accumulateLengthArray(expectation); |
| 116 EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "calc(10%%
+ 10ex + 10ch + 10vh + 10vmax)"))); | 116 EXPECT_TRUE(lengthArraysEqual(expectation, setLengthArray(actual, "calc(10%%
+ 10ex + 10ch + 10vh + 10vmax)"))); |
| 117 } | 117 } |
| 118 | 118 |
| 119 } | 119 } |
| OLD | NEW |