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

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

 #!/usr/bin/env python
 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import math
 import sys
 
 import json5_generator
 import template_expander
@@ skipping 193 matching lines @@
         field_dependencies += entry['field_dependencies']
     return field_dependencies
 
 
 def _create_diff_groups(fields_to_diff, methods_to_diff, predicates_to_test, root_group):
     diff_group = DiffGroup(root_group.member_name)
     field_dependencies = _list_field_dependencies(methods_to_diff + predicates_to_test)
     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:
+        for field in root_group.fields:
+            if not field.is_inherited_flag and entry == field.property_name:
                 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
 
 
 def _create_enums(properties):
     """
     Returns an OrderedDict of enums to be generated, enum name -> [list of enum values]
     """
     enums = {}
     for property_ in properties:
         # Only generate enums for keyword properties that use the default field_type_path.
@@ skipping 223 matching lines @@
 
     @template_expander.use_jinja('ComputedStyleBaseConstants.h.tmpl')
     def generate_base_computed_style_constants(self):
         return {
             'properties': self._properties,
             'enums': self._generated_enums,
         }
 
 if __name__ == '__main__':
     json5_generator.Maker(ComputedStyleBaseWriter).main()