Ensure the diff functions are generated in order specified in the JSON file

third_party/WebKit/Source/build/scripts/make_computed_style_base.py

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 787cee19849787eef9a24045da25f01337c15b4e..874017901355b11f7760eefa63ed2288c98e9773 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
@@ -211,16 +211,18 @@ def _create_diff_groups(fields_to_diff, methods_to_diff, predicates_to_test, roo
     for subgroup in root_group.subgroups:
         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, predicates_to_test, subgroup))
-    for field in root_group.fields:
-        if not field.is_inherited_flag:
-            if field.property_name in fields_to_diff:
+    for entry in fields_to_diff:

[nainar, 2017/05/26 01:16:02]

Could make one unified list of fields and field_dependencies but that makes the
code ugly cause you have to differentiate between expressions and predicates.

[shend, 2017/05/26 01:34:30]

Agreed.

+        for field in root_group.fields:
+            if (not field.is_inherited_flag) and (entry == field.property_name):

[shend, 2017/05/26 01:34:29]

nit: don't need brackets around conditions.

                 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'])
-            for entry in predicates_to_test:
-                if field.property_name in entry['field_dependencies']:
-                    diff_group.predicates.append(entry['predicate'])
+    for entry in methods_to_diff:
+        for field in root_group.fields:
+            if (not field.is_inherited_flag) and (field.property_name in entry['field_dependencies']):
+                diff_group.expressions.append(entry['method'])
+    for entry in predicates_to_test:
+        for field in root_group.fields:
+            if (not field.is_inherited_flag) and (field.property_name in entry['field_dependencies']):
+                diff_group.predicates.append(entry['predicate'])
     return diff_group