OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
3 * | 3 * |
4 * * Redistributions of source code must retain the above copyright | 4 * * Redistributions of source code must retain the above copyright |
5 * notice, this list of conditions and the following disclaimer. | 5 * notice, this list of conditions and the following disclaimer. |
6 * * Redistributions in binary form must reproduce the above | 6 * * Redistributions in binary form must reproduce the above |
7 * copyright notice, this list of conditions and the following disclaimer | 7 * copyright notice, this list of conditions and the following disclaimer |
8 * in the documentation and/or other materials provided with the | 8 * in the documentation and/or other materials provided with the |
9 * distribution. | 9 * distribution. |
10 * * Neither the name of Google Inc. nor the names of its | 10 * * Neither the name of Google Inc. nor the names of its |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
70 if (value->isPrimitiveValue()) { | 70 if (value->isPrimitiveValue()) { |
71 ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNone); | 71 ASSERT(toCSSPrimitiveValue(value)->getValueID() == CSSValueNone); |
72 return ComputedStyle::initialBoxReflect(); | 72 return ComputedStyle::initialBoxReflect(); |
73 } | 73 } |
74 | 74 |
75 CSSReflectValue* reflectValue = toCSSReflectValue(value); | 75 CSSReflectValue* reflectValue = toCSSReflectValue(value); |
76 RefPtr<StyleReflection> reflection = StyleReflection::create(); | 76 RefPtr<StyleReflection> reflection = StyleReflection::create(); |
77 reflection->setDirection(*reflectValue->direction()); | 77 reflection->setDirection(*reflectValue->direction()); |
78 if (reflectValue->offset()) | 78 if (reflectValue->offset()) |
79 reflection->setOffset(reflectValue->offset()->convertToLength(state.cssT oLengthConversionData())); | 79 reflection->setOffset(reflectValue->offset()->convertToLength(state.cssT oLengthConversionData())); |
80 NinePieceImage mask; | 80 NinePieceImage mask; |
Timothy Loh
2015/10/06 02:50:46
the if check you're adding should start from here
sashab
2015/10/07 01:37:58
Are you sure? Surely we want mask.setMaskDefaults(
Timothy Loh
2015/10/07 02:27:00
We don't need to setMask at all in this case thoug
sashab
2015/10/07 02:33:35
Oh I see, good point. Fixed up now.
| |
81 mask.setMaskDefaults(); | 81 mask.setMaskDefaults(); |
82 CSSToStyleMap::mapNinePieceImage(state, CSSPropertyWebkitBoxReflect, reflect Value->mask(), mask); | 82 if (reflectValue->mask()) |
83 CSSToStyleMap::mapNinePieceImage(state, CSSPropertyWebkitBoxReflect, *re flectValue->mask(), mask); | |
83 reflection->setMask(mask); | 84 reflection->setMask(mask); |
84 | 85 |
85 return reflection.release(); | 86 return reflection.release(); |
86 } | 87 } |
87 | 88 |
88 Color StyleBuilderConverter::convertColor(StyleResolverState& state, CSSValue* v alue, bool forVisitedLink) | 89 Color StyleBuilderConverter::convertColor(StyleResolverState& state, CSSValue* v alue, bool forVisitedLink) |
89 { | 90 { |
90 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); | 91 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); |
91 return state.document().textLinkColors().colorFromPrimitiveValue(primitiveVa lue, state.style()->color(), forVisitedLink); | 92 return state.document().textLinkColors().colorFromPrimitiveValue(primitiveVa lue, state.style()->color(), forVisitedLink); |
92 } | 93 } |
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
968 return ScaleTransformOperation::create(sx, sy, sz, TransformOperation::Scale 3D); | 969 return ScaleTransformOperation::create(sx, sy, sz, TransformOperation::Scale 3D); |
969 } | 970 } |
970 | 971 |
971 RespectImageOrientationEnum StyleBuilderConverter::convertImageOrientation(Style ResolverState& state, CSSValue* value) | 972 RespectImageOrientationEnum StyleBuilderConverter::convertImageOrientation(Style ResolverState& state, CSSValue* value) |
972 { | 973 { |
973 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); | 974 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); |
974 return primitiveValue->getValueID() == CSSValueFromImage ? RespectImageOrien tation : DoNotRespectImageOrientation; | 975 return primitiveValue->getValueID() == CSSValueFromImage ? RespectImageOrien tation : DoNotRespectImageOrientation; |
975 } | 976 } |
976 | 977 |
977 } // namespace blink | 978 } // namespace blink |
OLD | NEW |