| Index: third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.cpp.tmpl
|
| diff --git a/third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.cpp.tmpl b/third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.cpp.tmpl
|
| index 4c8ec2878b49986a3c0f7c9078c39b2aaec4d811..16f0ab40d9eb490964aa6dc93f84db67e05fc82f 100644
|
| --- a/third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.cpp.tmpl
|
| +++ b/third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.cpp.tmpl
|
| @@ -17,21 +17,21 @@ struct SameSizeAsComputedStyleBase {
|
| // ensure that the buckets are placed so that each takes up at most 1 word.
|
| ASSERT_SIZE(ComputedStyleBase, SameSizeAsComputedStyleBase);
|
|
|
| -void ComputedStyleBase::inheritFrom(const ComputedStyleBase& inheritParent,
|
| +void ComputedStyleBase::InheritFrom(const ComputedStyleBase& inheritParent,
|
| IsAtShadowBoundary isAtShadowBoundary) {
|
| {% for field in fields if field.is_inherited %}
|
| {{field.name}} = inheritParent.{{field.name}};
|
| {% endfor %}
|
| }
|
|
|
| -void ComputedStyleBase::copyNonInheritedFromCached(
|
| +void ComputedStyleBase::CopyNonInheritedFromCached(
|
| const ComputedStyleBase& other) {
|
| {% for field in fields if (field.is_property and not field.is_inherited) or field.is_inherited_flag %}
|
| {{field.name}} = other.{{field.name}};
|
| {% endfor %}
|
| }
|
|
|
| -void ComputedStyleBase::propagateIndependentInheritedProperties(
|
| +void ComputedStyleBase::PropagateIndependentInheritedProperties(
|
| const ComputedStyleBase& parentStyle) {
|
| {% for field in fields if field.is_property and field.is_independent %}
|
| if ({{field.is_inherited_method_name}}())
|
|
|