| Index: Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
|
| diff --git a/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl b/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
|
| index 1d662ef4bcd0a00d937606a3cfa9002ad8b4bcbe..062df1fb6d6b433b69e38f2bab7fd27ec8364e05 100644
|
| --- a/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
|
| +++ b/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl
|
| @@ -457,7 +457,7 @@ namespace WebCore {
|
| {{ set_value(property) }}(ShapeValue::createImageValue(state.styleImage({{property_id}}, value)));
|
| } else if (value->isValueList()) {
|
| RefPtr<BasicShape> shape;
|
| - LayoutBox layoutBox = BoxMissing;
|
| + CSSBoxType cssBox = BoxMissing;
|
| CSSValueList* valueList = toCSSValueList(value);
|
| for (unsigned i = 0; i < valueList->length(); ++i) {
|
| CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(valueList->itemWithoutBoundsCheck(i));
|
| @@ -467,15 +467,15 @@ namespace WebCore {
|
| || primitiveValue->getValueID() == CSSValueBorderBox
|
| || primitiveValue->getValueID() == CSSValuePaddingBox
|
| || primitiveValue->getValueID() == CSSValueMarginBox)
|
| - layoutBox = LayoutBox(*primitiveValue);
|
| + cssBox = CSSBoxType(*primitiveValue);
|
| else
|
| return;
|
| }
|
|
|
| if (shape)
|
| - {{ set_value(property) }}(ShapeValue::createShapeValue(shape.release(), layoutBox));
|
| - else if (layoutBox != BoxMissing)
|
| - {{ set_value(property) }}(ShapeValue::createLayoutBoxValue(layoutBox));
|
| + {{ set_value(property) }}(ShapeValue::createShapeValue(shape.release(), cssBox));
|
| + else if (cssBox != BoxMissing)
|
| + {{ set_value(property) }}(ShapeValue::createBoxShapeValue(cssBox));
|
| }
|
| }
|
| {%- endmacro %}
|
|
|