Move IDLs to 39 roll

bindings/scripts/idl_reader.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 21 matching lines @@
 http://www.chromium.org/developers/design-documents/idl-compiler#TOC-Front-end
 """
 
 import os
 
 import blink_idl_parser
 from blink_idl_parser import BlinkIDLParser
 from idl_definitions import IdlDefinitions
 from idl_validator import EXTENDED_ATTRIBUTES_RELATIVE_PATH, IDLInvalidExtendedAttributeError, IDLExtendedAttributeValidator
 from interface_dependency_resolver import InterfaceDependencyResolver
+from utilities import idl_filename_to_component
 
 
 class IdlReader(object):
     def __init__(self, interfaces_info=None, outputdir='', multi_interface=False):
         self.multi_interface = multi_interface
         self.extended_attribute_validator = IDLExtendedAttributeValidator()
+        self.interfaces_info = interfaces_info
 
         if interfaces_info:
             self.interface_dependency_resolver = InterfaceDependencyResolver(interfaces_info, self)
         else:
             self.interface_dependency_resolver = None
 
         self.parser = BlinkIDLParser(outputdir=outputdir)
 
     def read_idl_definitions(self, idl_filename):
-        """Returns an IdlDefinitions object for an IDL file, including all dependencies."""
+        """Returns a dictionary whose key is component and value is an IdlDefinitions object for an IDL file, including all dependencies."""
         definitions = self.read_idl_file(idl_filename)
+        component = idl_filename_to_component(idl_filename)
+
         if not self.interface_dependency_resolver:
-            return definitions
-        self.interface_dependency_resolver.resolve_dependencies(definitions)
-        return definitions
+            return {component: definitions}
+
+        # This definitions should have a dictionary. No need to resolve any
+        # dependencies.
+        if not definitions.interfaces:
+            return {component: definitions}
+
+        return self.interface_dependency_resolver.resolve_dependencies(definitions, component)
 
     def read_idl_file(self, idl_filename):
         """Returns an IdlDefinitions object for an IDL file, without any dependencies.
 
         The IdlDefinitions object is guaranteed to contain a single
         IdlInterface; it may also contain other definitions, such as
         callback functions and enumerations."""
         ast = blink_idl_parser.parse_file(self.parser, idl_filename)
         if not ast:
             raise Exception('Failed to parse %s' % idl_filename)
@@ skipping 34 matching lines @@
 IDL ATTRIBUTE ERROR in file:
 %s:
     %s
 If you want to add a new IDL extended attribute, please add it to:
     %s
 and add an explanation to the Blink IDL documentation at:
     http://www.chromium.org/blink/webidl/blink-idl-extended-attributes
     """ % (idl_filename, str(error), EXTENDED_ATTRIBUTES_RELATIVE_PATH))
 
         return definitions