Added CSSPropertyAPIMethods.json5 which defines all API methods.

third_party/WebKit/Source/build/scripts/make_css_property_apis.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 sys
 
 import json5_generator
 import template_expander
 import make_style_builder
 
 from collections import namedtuple, defaultdict
+from json5_generator import Json5File
+from make_style_builder import StyleBuilderWriter
 
 # Gets the classname for a given property.
 def get_classname(property):
     if property['api_class'] is True:
         # This property had the generated_api_class flag set in CSSProperties.json5.
         return 'CSSPropertyAPI' + property['upper_camel_name']
     # This property has a specified class name.
     assert isinstance(property['api_class'], str), \
         ("api_class value for " + property['api_class'] + " should be None, True or a string")
     return property['api_class']
 
 
-class CSSPropertyAPIWriter(make_style_builder.StyleBuilderWriter):
-    def __init__(self, json5_file_path):
-        super(CSSPropertyAPIWriter, self).__init__(json5_file_path)
+class CSSPropertyAPIWriter(json5_generator.Writer):
+    def __init__(self, json5_file_paths):
+        super(CSSPropertyAPIWriter, self).__init__(None)
+        assert len(json5_file_paths) == 2, 'CSSPropertyAPIWriter requires 2 input json5 files files, got %d.' % len(json5_file_paths)
+
+        self.css_properties = StyleBuilderWriter([json5_file_paths[0]])
+        self.css_property_api_methods = Json5File.load_from_files([json5_file_paths[1]], {}, {})
+
         self._outputs = {
             'CSSPropertyDescriptor.cpp': self.generate_property_descriptor_cpp,
         }
 
+        # Stores a map of API method name -> (signature, function_ptr)
+        self.all_api_methods = {}
+        ApiMethod = namedtuple('ApiMethod', ('signature', 'function_ptr'))
+        for api_method in self.css_property_api_methods.name_dictionaries:
+            self.all_api_methods[api_method['name']] = ApiMethod(
+                signature=api_method['signature'],
+                function_ptr=api_method['function_ptr'],
+            )
+
+        # Stores an ORDERED list of all API method names.

[sashab, 2017/02/09 04:36:28]

This must match the order they appear in the Descriptor object.

+        self.all_api_method_names = [api_method['name'] for api_method in self.css_property_api_methods.name_dictionaries]
+
         # Temporary map of API classname to list of propertyIDs that the API class is for.
         properties_for_class = defaultdict(list)
-        # Temporary map of API classname to set of method names this API class implements
-        api_methods_for_class = defaultdict(set)
-        for property in self._properties.values():
+        # Map of API classname to list of methods implemented in the API.
+        self.methods_for_class = defaultdict(list)
+        for property in self.css_properties.properties().values():
             if property['api_class'] is None:
                 continue
             classname = get_classname(property)
-            api_methods_for_class[classname] = property['api_methods']
             properties_for_class[classname].append(property['property_id'])
-            self._outputs[classname + '.h'] = self.generate_property_api_h_builder(classname, property['api_methods'])
+            self.methods_for_class[classname].extend(property['api_methods'])

[sashab, 2017/02/09 04:36:28]

+=

+            self._outputs[classname + '.h'] = self.generate_property_api_h_builder(classname)
 
         # Stores a list of classes with elements (index, classname, [propertyIDs, ..], [api_methods, ...]).
         self._api_classes = []
-
-        ApiClass = namedtuple('ApiClass', ('index', 'classname', 'property_ids', 'api_methods'))
+        ApiClass = namedtuple('ApiClass', ('index', 'classname', 'property_ids', 'methods_for_class'))
         for i, classname in enumerate(properties_for_class.keys()):
             self._api_classes.append(ApiClass(
                 index=i + 1,
                 classname=classname,
                 property_ids=properties_for_class[classname],
-                api_methods=api_methods_for_class[classname],
+                methods_for_class=self.methods_for_class[classname]
             ))
 
     @template_expander.use_jinja('CSSPropertyDescriptor.cpp.tmpl')
     def generate_property_descriptor_cpp(self):
         return {
             'api_classes': self._api_classes,
-            'api_methods': self.json5_file.parameters['api_methods']['valid_values'],
+            'all_api_method_names': self.all_api_method_names,
+            'methods_for_class': self.methods_for_class,

[sashab, 2017/02/09 04:36:28]

Delete methods_for_class

         }
 
     # Provides a function object given the classname of the property.
-    def generate_property_api_h_builder(self, api_classname, api_methods):
+    def generate_property_api_h_builder(self, api_classname):
         @template_expander.use_jinja('CSSPropertyAPIFiles.h.tmpl')
         def generate_property_api_h():
             return {
                 'api_classname': api_classname,
-                'api_methods': api_methods,
+                'methods_for_class': self.methods_for_class[api_classname],

[sashab, 2017/02/09 04:36:28]

Change dictionary from methods_for_class -> methods_for_classes

+                'all_api_methods': self.all_api_methods,
             }
         return generate_property_api_h
 
 if __name__ == '__main__':
     json5_generator.Maker(CSSPropertyAPIWriter).main()