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 1125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1136 for (unsigned i = 0; i < value_list.length(); ++i) { | 1136 for (unsigned i = 0; i < value_list.length(); ++i) { |
1137 const CSSValue& value = value_list.Item(i); | 1137 const CSSValue& value = value_list.Item(i); |
1138 if (value.IsBasicShapeValue()) { | 1138 if (value.IsBasicShapeValue()) { |
1139 shape = BasicShapeForValue(state, value); | 1139 shape = BasicShapeForValue(state, value); |
1140 } else { | 1140 } else { |
1141 css_box = ToCSSIdentifierValue(value).ConvertTo<CSSBoxType>(); | 1141 css_box = ToCSSIdentifierValue(value).ConvertTo<CSSBoxType>(); |
1142 } | 1142 } |
1143 } | 1143 } |
1144 | 1144 |
1145 if (shape) | 1145 if (shape) |
1146 return ShapeValue::CreateShapeValue(shape.Release(), css_box); | 1146 return ShapeValue::CreateShapeValue(std::move(shape), css_box); |
1147 | 1147 |
1148 DCHECK_NE(css_box, kBoxMissing); | 1148 DCHECK_NE(css_box, kBoxMissing); |
1149 return ShapeValue::CreateBoxShapeValue(css_box); | 1149 return ShapeValue::CreateBoxShapeValue(css_box); |
1150 } | 1150 } |
1151 | 1151 |
1152 float StyleBuilderConverter::ConvertSpacing(StyleResolverState& state, | 1152 float StyleBuilderConverter::ConvertSpacing(StyleResolverState& state, |
1153 const CSSValue& value) { | 1153 const CSSValue& value) { |
1154 if (value.IsIdentifierValue() && | 1154 if (value.IsIdentifierValue() && |
1155 ToCSSIdentifierValue(value).GetValueID() == CSSValueNormal) | 1155 ToCSSIdentifierValue(value).GetValueID() == CSSValueNormal) |
1156 return 0; | 1156 return 0; |
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1423 } | 1423 } |
1424 | 1424 |
1425 const CSSValue& StyleBuilderConverter::ConvertRegisteredPropertyValue( | 1425 const CSSValue& StyleBuilderConverter::ConvertRegisteredPropertyValue( |
1426 const StyleResolverState& state, | 1426 const StyleResolverState& state, |
1427 const CSSValue& value) { | 1427 const CSSValue& value) { |
1428 return ComputeRegisteredPropertyValue(state.CssToLengthConversionData(), | 1428 return ComputeRegisteredPropertyValue(state.CssToLengthConversionData(), |
1429 value); | 1429 value); |
1430 } | 1430 } |
1431 | 1431 |
1432 } // namespace blink | 1432 } // namespace blink |
OLD | NEW |