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 83f29d09d0feb23f4b6804728c41679117689d4c..8ceae897f076745be4cd8f4098210a2f071d7c7f 100644 |
--- a/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl |
+++ b/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl |
@@ -50,11 +50,11 @@ namespace blink { |
{{declare_initial_function(property_id)}} |
{ |
{% if property.svg %} |
- {{set_value(property)}}(SVGLayoutStyle::{{property.initial}}()); |
+ {{set_value(property)}}(SVGComputedStyle::{{property.initial}}()); |
{% elif property.font %} |
{{set_value(property)}}(FontBuilder::{{property.initial}}()); |
{% else %} |
- {{set_value(property)}}(LayoutStyle::{{property.initial}}()); |
+ {{set_value(property)}}(ComputedStyle::{{property.initial}}()); |
{% endif %} |
} |
@@ -311,7 +311,7 @@ static bool lengthTypeAndValueMatch(const BorderImageLengthBox& borderImageLengt |
state.style()->{{visited_link_setter}}(StyleBuilderConverter::convertStyleColor(state, value, true)); |
} |
{% endmacro %} |
-{{apply_color('CSSPropertyBackgroundColor', initial_color='LayoutStyle::initialBackgroundColor') }} |
+{{apply_color('CSSPropertyBackgroundColor', initial_color='ComputedStyle::initialBackgroundColor') }} |
{{apply_color('CSSPropertyBorderBottomColor')}} |
{{apply_color('CSSPropertyBorderLeftColor')}} |
{{apply_color('CSSPropertyBorderRightColor')}} |
@@ -468,9 +468,9 @@ static bool lengthTypeAndValueMatch(const BorderImageLengthBox& borderImageLengt |
{% macro apply_grid_template(property_id, type) %} |
{{declare_initial_function(property_id)}} |
{ |
- state.style()->setGridTemplate{{type}}s(LayoutStyle::initialGridTemplate{{type}}s()); |
- state.style()->setNamedGrid{{type}}Lines(LayoutStyle::initialNamedGrid{{type}}Lines()); |
- state.style()->setOrderedNamedGrid{{type}}Lines(LayoutStyle::initialOrderedNamedGrid{{type}}Lines()); |
+ state.style()->setGridTemplate{{type}}s(ComputedStyle::initialGridTemplate{{type}}s()); |
+ state.style()->setNamedGrid{{type}}Lines(ComputedStyle::initialNamedGrid{{type}}Lines()); |
+ state.style()->setOrderedNamedGrid{{type}}Lines(ComputedStyle::initialOrderedNamedGrid{{type}}Lines()); |
} |
{{declare_inherit_function(property_id)}} |
@@ -502,8 +502,8 @@ static bool lengthTypeAndValueMatch(const BorderImageLengthBox& borderImageLengt |
{% set property = properties[property_id] %} |
{{declare_initial_function(property_id)}} |
{ |
- state.style()->set{{alignment_type}}(LayoutStyle::initial{{alignment_type}}()); |
- state.style()->set{{alignment_type}}OverflowAlignment(LayoutStyle::initial{{alignment_type}}OverflowAlignment()); |
+ state.style()->set{{alignment_type}}(ComputedStyle::initial{{alignment_type}}()); |
+ state.style()->set{{alignment_type}}OverflowAlignment(ComputedStyle::initial{{alignment_type}}OverflowAlignment()); |
} |
{{declare_inherit_function(property_id)}} |
@@ -520,7 +520,7 @@ static bool lengthTypeAndValueMatch(const BorderImageLengthBox& borderImageLengt |
state.style()->set{{alignment_type}}OverflowAlignment(*pairValue->second()); |
} else { |
state.style()->set{{alignment_type}}(*primitiveValue); |
- state.style()->set{{alignment_type}}OverflowAlignment(LayoutStyle::initial{{alignment_type}}OverflowAlignment()); |
+ state.style()->set{{alignment_type}}OverflowAlignment(ComputedStyle::initial{{alignment_type}}OverflowAlignment()); |
} |
} |
{% endmacro %} |
@@ -532,9 +532,9 @@ static bool lengthTypeAndValueMatch(const BorderImageLengthBox& borderImageLengt |
{% set property = properties[property_id] %} |
{{declare_initial_function(property_id)}} |
{ |
- state.style()->set{{alignment_type}}(LayoutStyle::initial{{alignment_type}}()); |
- state.style()->set{{alignment_type}}OverflowAlignment(LayoutStyle::initial{{alignment_type}}OverflowAlignment()); |
- state.style()->set{{alignment_type}}Distribution(LayoutStyle::initial{{alignment_type}}Distribution()); |
+ state.style()->set{{alignment_type}}(ComputedStyle::initial{{alignment_type}}()); |
+ state.style()->set{{alignment_type}}OverflowAlignment(ComputedStyle::initial{{alignment_type}}OverflowAlignment()); |
+ state.style()->set{{alignment_type}}Distribution(ComputedStyle::initial{{alignment_type}}Distribution()); |
} |
{{declare_inherit_function(property_id)}} |
@@ -546,9 +546,9 @@ static bool lengthTypeAndValueMatch(const BorderImageLengthBox& borderImageLengt |
{{declare_value_function(property_id)}} |
{ |
- state.style()->set{{alignment_type}}(LayoutStyle::initial{{alignment_type}}()); |
- state.style()->set{{alignment_type}}OverflowAlignment(LayoutStyle::initial{{alignment_type}}OverflowAlignment()); |
- state.style()->set{{alignment_type}}Distribution(LayoutStyle::initial{{alignment_type}}Distribution()); |
+ state.style()->set{{alignment_type}}(ComputedStyle::initial{{alignment_type}}()); |
+ state.style()->set{{alignment_type}}OverflowAlignment(ComputedStyle::initial{{alignment_type}}OverflowAlignment()); |
+ state.style()->set{{alignment_type}}Distribution(ComputedStyle::initial{{alignment_type}}Distribution()); |
CSSContentDistributionValue* contentValue = toCSSContentDistributionValue(value); |
if (contentValue->distribution()->getValueID() != CSSValueInvalid) |
@@ -567,16 +567,16 @@ static bool lengthTypeAndValueMatch(const BorderImageLengthBox& borderImageLengt |
{{declare_initial_function(property_id)}} |
{ |
{{set_value(property)}}( |
- SVGLayoutStyle::initial{{paint_type}}Type(), |
- SVGLayoutStyle::initial{{paint_type}}Color(), |
- SVGLayoutStyle::initial{{paint_type}}Uri(), |
+ SVGComputedStyle::initial{{paint_type}}Type(), |
+ SVGComputedStyle::initial{{paint_type}}Color(), |
+ SVGComputedStyle::initial{{paint_type}}Uri(), |
state.applyPropertyToRegularStyle(), |
state.applyPropertyToVisitedLinkStyle()); |
} |
{{declare_inherit_function(property_id)}} |
{ |
- const SVGLayoutStyle& svgParentStyle = state.parentStyle()->svgStyle(); |
+ const SVGComputedStyle& svgParentStyle = state.parentStyle()->svgStyle(); |
{{set_value(property)}}( |
svgParentStyle.{{paint_type|lower_first}}Type(), |
svgParentStyle.{{paint_type|lower_first}}Color(), |