Source/core/animation/LengthPairStyleInterpolationTest.cpp - Issue 813233002: Animation: Fix loss of type information when interpolating value of 0

Side by Side Diff: Source/core/animation/LengthPairStyleInterpolationTest.cpp

Issue 813233002: Animation: Fix loss of type information when interpolating value of 0 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fix second accumulateLength method Created 6 years 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 unified diff | Download patch

« no previous file with comments | « Source/core/animation/LengthBoxStyleInterpolationTest.cpp ('k') | Source/core/animation/LengthPoint3DStyleInterpolationTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/LengthPairStyleInterpolation.h"	6 #include "core/animation/LengthPairStyleInterpolation.h"

7	7

8 #include "core/css/CSSPrimitiveValue.h"	8 #include "core/css/CSSPrimitiveValue.h"

9 #include "core/css/CSSValue.h"	9 #include "core/css/CSSValue.h"

10 #include "core/css/Pair.h"	10 #include "core/css/Pair.h"

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52 RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPx = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PX);	52 RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPx = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PX);

53 RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPx = CSSPrimitiveValue::create(0 , CSSPrimitiveValue::CSS_PX);	53 RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPx = CSSPrimitiveValue::create(0 , CSSPrimitiveValue::CSS_PX);

54 RefPtrWillBeRawPtr<Pair> pairPx = Pair::create(firstPx, secondPx, Pair::Keep IdenticalValues);	54 RefPtrWillBeRawPtr<Pair> pairPx = Pair::create(firstPx, secondPx, Pair::Keep IdenticalValues);

55 RefPtrWillBeRawPtr<CSSValue> value1 = roundTrip(CSSPrimitiveValue::create(pa irPx.release()), ValueRangeNonNegative);	55 RefPtrWillBeRawPtr<CSSValue> value1 = roundTrip(CSSPrimitiveValue::create(pa irPx.release()), ValueRangeNonNegative);

56 testPrimitiveValue(value1, 0, 0, CSSPrimitiveValue::CSS_PX);	56 testPrimitiveValue(value1, 0, 0, CSSPrimitiveValue::CSS_PX);

57	57

58 RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPc = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PERCENTAGE);	58 RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPc = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_PERCENTAGE);

59 RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPc = CSSPrimitiveValue::create(0 , CSSPrimitiveValue::CSS_PERCENTAGE);	59 RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPc = CSSPrimitiveValue::create(0 , CSSPrimitiveValue::CSS_PERCENTAGE);

60 RefPtrWillBeRawPtr<Pair> pairPc = Pair::create(firstPc, secondPc, Pair::Keep IdenticalValues);	60 RefPtrWillBeRawPtr<Pair> pairPc = Pair::create(firstPc, secondPc, Pair::Keep IdenticalValues);

61 RefPtrWillBeRawPtr<CSSValue> value2 = roundTrip(CSSPrimitiveValue::create(pa irPc.release()), ValueRangeNonNegative);	61 RefPtrWillBeRawPtr<CSSValue> value2 = roundTrip(CSSPrimitiveValue::create(pa irPc.release()), ValueRangeNonNegative);

62 testPrimitiveValue(value2, 0, 0, CSSPrimitiveValue::CSS_PX);	62 testPrimitiveValue(value2, 0, 0, CSSPrimitiveValue::CSS_PERCENTAGE);

63	63

64 RefPtrWillBeRawPtr<CSSPrimitiveValue> firstEms = CSSPrimitiveValue::create(0 , CSSPrimitiveValue::CSS_EMS);	64 RefPtrWillBeRawPtr<CSSPrimitiveValue> firstEms = CSSPrimitiveValue::create(0 , CSSPrimitiveValue::CSS_EMS);

65 RefPtrWillBeRawPtr<CSSPrimitiveValue> secondEms = CSSPrimitiveValue::create( 0, CSSPrimitiveValue::CSS_EMS);	65 RefPtrWillBeRawPtr<CSSPrimitiveValue> secondEms = CSSPrimitiveValue::create( 0, CSSPrimitiveValue::CSS_EMS);

66 RefPtrWillBeRawPtr<Pair> pairEms = Pair::create(firstEms, secondEms, Pair::K eepIdenticalValues);	66 RefPtrWillBeRawPtr<Pair> pairEms = Pair::create(firstEms, secondEms, Pair::K eepIdenticalValues);

67 RefPtrWillBeRawPtr<CSSValue> value3 = roundTrip(CSSPrimitiveValue::create(pa irEms.release()), ValueRangeNonNegative);	67 RefPtrWillBeRawPtr<CSSValue> value3 = roundTrip(CSSPrimitiveValue::create(pa irEms.release()), ValueRangeNonNegative);

68 testPrimitiveValue(value3, 0, 0, CSSPrimitiveValue::CSS_PX);	68 testPrimitiveValue(value3, 0, 0, CSSPrimitiveValue::CSS_EMS);

69	69

70 RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPcNeg = CSSPrimitiveValue::create (0, CSSPrimitiveValue::CSS_PERCENTAGE);	70 RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPcNeg = CSSPrimitiveValue::create (0, CSSPrimitiveValue::CSS_PERCENTAGE);

71 RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPcNeg = CSSPrimitiveValue::creat e(0, CSSPrimitiveValue::CSS_PERCENTAGE);	71 RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPcNeg = CSSPrimitiveValue::creat e(0, CSSPrimitiveValue::CSS_PERCENTAGE);

72 RefPtrWillBeRawPtr<Pair> pairPcNeg = Pair::create(firstPcNeg, secondPcNeg, P air::KeepIdenticalValues);	72 RefPtrWillBeRawPtr<Pair> pairPcNeg = Pair::create(firstPcNeg, secondPcNeg, P air::KeepIdenticalValues);

73 RefPtrWillBeRawPtr<CSSValue> value4 = roundTrip(CSSPrimitiveValue::create(pa irPcNeg.release()), ValueRangeAll);	73 RefPtrWillBeRawPtr<CSSValue> value4 = roundTrip(CSSPrimitiveValue::create(pa irPcNeg.release()), ValueRangeAll);

74 testPrimitiveValue(value4, 0, 0, CSSPrimitiveValue::CSS_PX);	74 testPrimitiveValue(value4, 0, 0, CSSPrimitiveValue::CSS_PERCENTAGE);

75 }	75 }

76	76

77 TEST_F(LengthPairStyleInterpolationTest, MultipleValueTest)	77 TEST_F(LengthPairStyleInterpolationTest, MultipleValueTest)

78 {	78 {

79 RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPx = CSSPrimitiveValue::create(10 , CSSPrimitiveValue::CSS_PX);	79 RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPx = CSSPrimitiveValue::create(10 , CSSPrimitiveValue::CSS_PX);

80 RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPx = CSSPrimitiveValue::create(2 0, CSSPrimitiveValue::CSS_PX);	80 RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPx = CSSPrimitiveValue::create(2 0, CSSPrimitiveValue::CSS_PX);

81 RefPtrWillBeRawPtr<Pair> pairPx = Pair::create(firstPx, secondPx, Pair::Keep IdenticalValues);	81 RefPtrWillBeRawPtr<Pair> pairPx = Pair::create(firstPx, secondPx, Pair::Keep IdenticalValues);

82 RefPtrWillBeRawPtr<CSSValue> value5 = roundTrip(CSSPrimitiveValue::create(pa irPx.release()), ValueRangeNonNegative);	82 RefPtrWillBeRawPtr<CSSValue> value5 = roundTrip(CSSPrimitiveValue::create(pa irPx.release()), ValueRangeNonNegative);

83 testPrimitiveValue(value5, 10, 20, CSSPrimitiveValue::CSS_PX);	83 testPrimitiveValue(value5, 10, 20, CSSPrimitiveValue::CSS_PX);

84	84

85 RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPc = CSSPrimitiveValue::create(30 , CSSPrimitiveValue::CSS_PERCENTAGE);	85 RefPtrWillBeRawPtr<CSSPrimitiveValue> firstPc = CSSPrimitiveValue::create(30 , CSSPrimitiveValue::CSS_PERCENTAGE);

86 RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPc = CSSPrimitiveValue::create(- 30, CSSPrimitiveValue::CSS_PERCENTAGE);	86 RefPtrWillBeRawPtr<CSSPrimitiveValue> secondPc = CSSPrimitiveValue::create(- 30, CSSPrimitiveValue::CSS_PERCENTAGE);

87 RefPtrWillBeRawPtr<Pair> pairPc = Pair::create(firstPc, secondPc, Pair::Keep IdenticalValues);	87 RefPtrWillBeRawPtr<Pair> pairPc = Pair::create(firstPc, secondPc, Pair::Keep IdenticalValues);

88 RefPtrWillBeRawPtr<CSSValue> value6 = roundTrip(CSSPrimitiveValue::create(pa irPc.release()), ValueRangeNonNegative);	88 RefPtrWillBeRawPtr<CSSValue> value6 = roundTrip(CSSPrimitiveValue::create(pa irPc.release()), ValueRangeNonNegative);

89 testPrimitiveValue(value6, 30, 0, CSSPrimitiveValue::CSS_PERCENTAGE);	89 testPrimitiveValue(value6, 30, 0, CSSPrimitiveValue::CSS_PERCENTAGE);

90 }	90 }

91	91

92 }	92 }

OLD	NEW