[bindings] partial interfaces should not violate componentization

Source/bindings/scripts/code_generator_v8.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 60 matching lines @@
 import jinja2
 
 import idl_types
 from idl_types import IdlType
 import v8_callback_interface
 import v8_dictionary
 from v8_globals import includes, interfaces
 import v8_interface
 import v8_types
 from v8_utilities import capitalize, cpp_name, conditional_string, v8_class_name
-from utilities import KNOWN_COMPONENTS
+from utilities import KNOWN_COMPONENTS, idl_filename_to_component, is_valid_component_dependency
 
 
-def render_template(interface_info, header_template, cpp_template,
-                    template_context):
+def render_template(include_paths, header_template, cpp_template,
+                    template_context, component=None):
     template_context['code_generator'] = module_pyname
 
     # Add includes for any dependencies
     template_context['header_includes'] = sorted(
         template_context['header_includes'])
-    includes.update(interface_info.get('dependencies_include_paths', []))
+
+    for include_path in include_paths:
+        if component:
+            dependency = idl_filename_to_component(include_path)
+            if not is_valid_component_dependency(component, dependency):
+                continue
+        includes.add(include_path)
+
     template_context['cpp_includes'] = sorted(includes)
 
     header_text = header_template.render(template_context)
     cpp_text = cpp_template.render(template_context)
     return header_text, cpp_text
 
 
 class CodeGeneratorBase(object):
     """Base class for v8 bindings generator and IDL dictionary impl generator"""
 
@@ skipping 37 matching lines @@
 
     def generate_code_internal(self, definitions, definition_name):
         if definition_name in definitions.interfaces:
             return self.generate_interface_code(
                 definitions, definition_name,
                 definitions.interfaces[definition_name])
         if definition_name in definitions.dictionaries:
             return self.generate_dictionary_code(
                 definitions, definition_name,
                 definitions.dictionaries[definition_name])
-        raise ValueError('%s is not in IDL definitions' % definition_name)
+
+        for method in definitions.interfaces.values():

[bashi, 2014/10/10 09:48:11]

Could you explain why this change is needed?

[tasak, 2014/10/10 11:43:40]

This is for avoiding exceptions when --generate-partial is enabled for
core_idl_files without modules dependency.
Now we are using core_idl_with_modules_dependency_files. So we don't need this.

+            if not method.is_partial:
+                raise ValueError('%s is not in IDL definitions' % definition_name)
 
     def generate_interface_code(self, definitions, interface_name, interface):
         # Store other interfaces for introspection
         interfaces.update(definitions.interfaces)
 
+        interface_info = self.interfaces_info[interface_name]
+        component = idl_filename_to_component(
+            interface_info.get('full_path'))
+        include_paths = interface_info.get('dependencies_include_paths')
+
         # Select appropriate Jinja template and contents function
+        definition_name = interface_name
         if interface.is_callback:
             header_template_filename = 'callback_interface.h'
             cpp_template_filename = 'callback_interface.cpp'
             interface_context = v8_callback_interface.callback_interface_context
+        elif interface.is_partial:
+            interface_context = v8_interface.interface_context
+            header_template_filename = 'partial_interface.h'
+            cpp_template_filename = 'partial_interface.cpp'
+            definition_name = ''.join([interface_name, 'Partial'])
+            assert component == 'core'
+            component = 'modules'
+            include_paths = interface_info.get('partial_interface_dependencies_include_paths')
         else:
             header_template_filename = 'interface.h'
             cpp_template_filename = 'interface.cpp'
             interface_context = v8_interface.interface_context
         header_template = self.jinja_env.get_template(header_template_filename)
         cpp_template = self.jinja_env.get_template(cpp_template_filename)
 
-        interface_info = self.interfaces_info[interface_name]
-
         template_context = interface_context(interface)
         # Add the include for interface itself
         template_context['header_includes'].add(interface_info['include_path'])
         header_text, cpp_text = render_template(
-            interface_info, header_template, cpp_template, template_context)
-        header_path, cpp_path = self.output_paths(interface_name)
+            include_paths, header_template, cpp_template, template_context,
+            component)
+        header_path, cpp_path = self.output_paths(definition_name)
         return (
             (header_path, header_text),
             (cpp_path, cpp_text),
         )
 
     def generate_dictionary_code(self, definitions, dictionary_name,
                                  dictionary):
         header_template = self.jinja_env.get_template('dictionary_v8.h')
         cpp_template = self.jinja_env.get_template('dictionary_v8.cpp')
         template_context = v8_dictionary.dictionary_context(dictionary)
         interface_info = self.interfaces_info[dictionary_name]
+        include_paths = interface_info.get('dependencies_include_paths')
         # Add the include for interface itself
         template_context['header_includes'].add(interface_info['include_path'])
         header_text, cpp_text = render_template(
-            interface_info, header_template, cpp_template, template_context)
+            include_paths, header_template, cpp_template, template_context)
         header_path, cpp_path = self.output_paths(dictionary_name)
         return (
             (header_path, header_text),
             (cpp_path, cpp_text),
         )
 
 
 class CodeGeneratorDictionaryImpl(CodeGeneratorBase):
     def __init__(self, interfaces_info, cache_dir, output_dir):
         CodeGeneratorBase.__init__(self, interfaces_info, cache_dir, output_dir)
 
     def output_paths(self, definition_name, interface_info):
         output_dir = posixpath.join(self.output_dir,
                                     interface_info['relative_dir'])
         header_path = posixpath.join(output_dir, '%s.h' % definition_name)
         cpp_path = posixpath.join(output_dir, '%s.cpp' % definition_name)
         return header_path, cpp_path
 
     def generate_code_internal(self, definitions, definition_name):
         if not definition_name in definitions.dictionaries:
             raise ValueError('%s is not an IDL dictionary')
         dictionary = definitions.dictionaries[definition_name]
         interface_info = self.interfaces_info[definition_name]
         header_template = self.jinja_env.get_template('dictionary_impl.h')
         cpp_template = self.jinja_env.get_template('dictionary_impl.cpp')
         template_context = v8_dictionary.dictionary_impl_context(
             dictionary, self.interfaces_info)
+        include_paths = interface_info.get('dependencies_include_paths')
         header_text, cpp_text = render_template(
-            interface_info, header_template, cpp_template, template_context)
+            include_paths, header_template, cpp_template, template_context)
         header_path, cpp_path = self.output_paths(
             definition_name, interface_info)
         return (
             (header_path, header_text),
             (cpp_path, cpp_text),
         )
 
 
 def initialize_jinja_env(cache_dir):
     jinja_env = jinja2.Environment(
@@ skipping 74 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))