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 e28efac956d4d2f552fd7210d5f3f19659ee7a4c..6f8132fe70b358ca26726b210874ee2cb79aad69 100644 |
--- a/third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.cpp.tmpl |
+++ b/third_party/WebKit/Source/build/scripts/templates/ComputedStyleBase.cpp.tmpl |
@@ -25,6 +25,7 @@ ASSERT_SIZE(ComputedStyleBase, SameSizeAsComputedStyleBase); |
void ComputedStyleBase::InheritFrom(const ComputedStyleBase& other, |
IsAtShadowBoundary isAtShadowBoundary) { |
{{fieldwise_copy(computed_style, computed_style.all_fields |
+ |selectattr("is_property") |
|selectattr("is_inherited") |
|list |
)|indent(2)}} |
@@ -33,7 +34,7 @@ void ComputedStyleBase::InheritFrom(const ComputedStyleBase& other, |
void ComputedStyleBase::CopyNonInheritedFromCached( |
const ComputedStyleBase& other) { |
{{fieldwise_copy(computed_style, computed_style.all_fields |
- |rejectattr("is_nonproperty") |
+ |rejectattr("has_custom_compare_and_copy") |
|rejectattr("is_inherited") |
|list |
)|indent(2)}} |