Source/core/animation/ShadowStyleInterpolationTest.cpp - Issue 844933002: Oilpan: fix build after r188114.

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

Issue 844933002: Oilpan: fix build after r188114. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 11 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 unified diff | Download patch

« no previous file with comments | « no previous file | no next file » | no next file with comments »

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

7	7

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

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

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

(...skipping 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57	57

58 RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y , blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueNone), color);	58 RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y , blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueNone), color);

59	59

60 RefPtrWillBeRawPtr<CSSValue> value = roundTrip(shadowValue.release(), false) ;	60 RefPtrWillBeRawPtr<CSSValue> value = roundTrip(shadowValue.release(), false) ;

61	61

62 testPrimitiveValues(value, 0, 0, 0, 0, makeRGBA(0, 0, 0, 0), CSSPrimitiveVal ue::createIdentifier(CSSValueNone), CSSPrimitiveValue::CSS_PX);	62 testPrimitiveValues(value, 0, 0, 0, 0, makeRGBA(0, 0, 0, 0), CSSPrimitiveVal ue::createIdentifier(CSSValueNone), CSSPrimitiveValue::CSS_PX);

63 }	63 }

64	64

65 TEST_F(AnimationShadowStyleInterpolationTest, MultipleValueNonPixelTest)	65 TEST_F(AnimationShadowStyleInterpolationTest, MultipleValueNonPixelTest)

66 {	66 {

67 RefPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor(makeRGBA(11 2, 123, 175, 255));	67 RefPtrWillBeRawPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor (makeRGBA(112, 123, 175, 255));

68 RefPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(10, CSSPrimitiveValu e::CSS_EMS);	68 RefPtrWillBeRawPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(10, CSSP rimitiveValue::CSS_EMS);

69 RefPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(20, CSSPrimitiveValu e::CSS_EMS);	69 RefPtrWillBeRawPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(20, CSSP rimitiveValue::CSS_EMS);

70 RefPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(30, CSSPrimitiveV alue::CSS_EMS);	70 RefPtrWillBeRawPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(30, C SSPrimitiveValue::CSS_EMS);

71 RefPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(40, CSSPrimitiv eValue::CSS_EMS);	71 RefPtrWillBeRawPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(40, CSSPrimitiveValue::CSS_EMS);

72	72

73 RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y , blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueNone), color);	73 RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y , blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueNone), color);

74	74

75 RefPtrWillBeRawPtr<CSSValue> value = roundTrip(shadowValue.release(), false) ;	75 RefPtrWillBeRawPtr<CSSValue> value = roundTrip(shadowValue.release(), false) ;

76	76

77 testPrimitiveValues(value, 10, 20, 30, 40, makeRGBA(112, 123, 175, 255), CSS PrimitiveValue::createIdentifier(CSSValueNone), CSSPrimitiveValue::CSS_EMS);	77 testPrimitiveValues(value, 10, 20, 30, 40, makeRGBA(112, 123, 175, 255), CSS PrimitiveValue::createIdentifier(CSSValueNone), CSSPrimitiveValue::CSS_EMS);

78 }	78 }

79	79

80 TEST_F(AnimationShadowStyleInterpolationTest, InsetShadowTest)	80 TEST_F(AnimationShadowStyleInterpolationTest, InsetShadowTest)

81 {	81 {

82 RefPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor(makeRGBA(54 , 48, 214, 64));	82 RefPtrWillBeRawPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor (makeRGBA(54, 48, 214, 64));

83 RefPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(10, CSSPrimitiveValu e::CSS_PX);	83 RefPtrWillBeRawPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(10, CSSP rimitiveValue::CSS_PX);

84 RefPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(20, CSSPrimitiveValu e::CSS_PX);	84 RefPtrWillBeRawPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(20, CSSP rimitiveValue::CSS_PX);

85 RefPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(30, CSSPrimitiveV alue::CSS_PX);	85 RefPtrWillBeRawPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(30, C SSPrimitiveValue::CSS_PX);

86 RefPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(40, CSSPrimitiv eValue::CSS_PX);	86 RefPtrWillBeRawPtr<CSSPrimitiveValue> spread = CSSPrimitiveValue::create(40, CSSPrimitiveValue::CSS_PX);

87	87

88 RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y , blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueInset), color);	88 RefPtrWillBeRawPtr<CSSShadowValue> shadowValue = CSSShadowValue::create(x, y , blur, spread, CSSPrimitiveValue::createIdentifier(CSSValueInset), color);

89	89

90 RefPtrWillBeRawPtr<CSSValue> value = roundTrip(shadowValue.release(), true);	90 RefPtrWillBeRawPtr<CSSValue> value = roundTrip(shadowValue.release(), true);

91	91

92 testPrimitiveValues(value, 10, 20, 30, 40, makeRGBA(54, 48, 214, 64), CSSPri mitiveValue::createIdentifier(CSSValueInset), CSSPrimitiveValue::CSS_PX);	92 testPrimitiveValues(value, 10, 20, 30, 40, makeRGBA(54, 48, 214, 64), CSSPri mitiveValue::createIdentifier(CSSValueInset), CSSPrimitiveValue::CSS_PX);

93 }	93 }

94	94

95 }	95 }

OLD	NEW