Index: third_party/WebKit/Source/build/scripts/make_computed_style_base.py |
diff --git a/third_party/WebKit/Source/build/scripts/make_computed_style_base.py b/third_party/WebKit/Source/build/scripts/make_computed_style_base.py |
index c039ac174bc2e60661b107c5e12a34f6147e42a7..f0e97600c30481d881c3c9a42a7d5ad069b03931 100755 |
--- a/third_party/WebKit/Source/build/scripts/make_computed_style_base.py |
+++ b/third_party/WebKit/Source/build/scripts/make_computed_style_base.py |
@@ -189,18 +189,29 @@ def _group_fields(fields): |
def _create_diff_groups_map(diff_function_inputs, root_group): |
diff_functions_map = {} |
for entry in diff_function_inputs: |
- diff_functions_map[entry['name']] = _create_diff_groups(entry['fields'], root_group) |
+ diff_functions_map[entry['name']] = _create_diff_groups(entry['fields_to_diff'], entry['methods_to_diff'], root_group) |
return diff_functions_map |
-def _create_diff_groups(fields_to_diff, root_group): |
+def _list_field_dependencies(methods_to_diff): |
+ field_dependencies = [] |
+ for entry in methods_to_diff: |
+ field_dependencies += entry['field_dependencies'] |
+ return field_dependencies |
+ |
+ |
+def _create_diff_groups(fields_to_diff, methods_to_diff, root_group): |
diff_group = DiffGroup(root_group.member_name) |
+ field_dependencies = _list_field_dependencies(methods_to_diff) |
for subgroup in root_group.subgroups: |
- if any(field.property_name in fields_to_diff for field in subgroup.all_fields): |
- diff_group.subgroups.append(_create_diff_groups(fields_to_diff, subgroup)) |
+ if any(field.property_name in (fields_to_diff + field_dependencies) for field in subgroup.all_fields): |
+ diff_group.subgroups.append(_create_diff_groups(fields_to_diff, methods_to_diff, subgroup)) |
for field in root_group.fields: |
if field.property_name in fields_to_diff: |
diff_group.expressions.append(field.getter_expression) |
+ for entry in methods_to_diff: |
+ if field.property_name in entry['field_dependencies']: |
+ diff_group.expressions.append(entry['method']) |
return diff_group |