Sky: different tack for custom Rect type in the Canvas API.

sky/engine/bindings/scripts/code_generator_dart.py

 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 131 matching lines @@
         template_contents['code_generator'] = module_pyname
 
         # Add includes for interface itself and any dependencies
         interface_info = self.interfaces_info[interface_name]
         template_contents['header_includes'].add(interface_info['include_path'])
         template_contents['header_includes'] = sorted(template_contents['header_includes'])
         includes.update(interface_info.get('dependencies_include_paths', []))
 
         template_contents['cpp_includes'] = sorted(includes)
 
-        # If CustomDart is set, read the custom dart file and add it to our
-        # template parameters.
-        if 'CustomDart' in interface.extended_attributes:
-          dart_filename = os.path.join(os.path.dirname(idl_filename),
-                                       interface.name + ".dart")
-          with open(dart_filename) as dart_file:
-              custom_dartcode = dart_file.read()
-              template_contents['custom_dartcode'] = custom_dartcode
-
         idl_world = {'interface': None, 'callback': None}
 
         # Load the pickle file for this IDL.
         if os.path.isfile(idl_pickle_filename):
             with open(idl_pickle_filename) as idl_pickle_file:
                 idl_global_data = pickle.load(idl_pickle_file)
                 idl_pickle_file.close()
             idl_world['interface'] = idl_global_data['interface']
             idl_world['callback'] = idl_global_data['callback']
 
@@ skipping 18 matching lines @@
         dart_text = dart_template.render(template_contents)
 
         return header_text, cpp_text, dart_text
 
     def load_global_pickles(self, global_entries):
         # List of all interfaces and callbacks for global code generation.
         world = {'interfaces': [], 'callbacks': []}
 
         # Load all pickled data for each interface.
         for (directory, file_list) in global_entries:
-            for idl_filename in file_list:
-                interface_name = idl_filename_to_interface_name(idl_filename)
+            for filename in file_list:
+                if os.path.splitext(filename)[1] == '.dart':
+                    # Special case: any .dart files in the list should be added
+                    # to dart_sky.dart directly, but don't need to be processed.
+                    interface_name = os.path.splitext(os.path.basename(filename))[0]
+                    world['interfaces'].append({'name': interface_name})
+                    continue
+                interface_name = idl_filename_to_interface_name(filename)
                 idl_pickle_filename = interface_name + "_globals.pickle"
                 idl_pickle_filename = os.path.join(directory, idl_pickle_filename)
                 if not os.path.exists(idl_pickle_filename):
                     logging.warn("Missing %s" % idl_pickle_filename)
                     continue
                 with open(idl_pickle_filename) as idl_pickle_file:
                     idl_world = pickle.load(idl_pickle_file)
                     if 'interface' in idl_world:
                         # FIXME: Why are some of these None?
                         if idl_world['interface']:
@@ skipping 70 matching lines @@
 
     # Create a dummy file as output for the build system,
     # since filenames of individual cache files are unpredictable and opaque
     # (they are hashes of the template path, which varies based on environment)
     with open(dummy_filename, 'w') as dummy_file:
         pass  # |open| creates or touches the file
 
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv))