Roll IDL to multivm@1316

core/scripts/make_dom_exceptions.py

 #!/usr/bin/env python
 # 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
@@ skipping 34 matching lines @@
 
 typedef int ExceptionCode;
 
 enum ExceptionType {
 %(exception_types)s
 };
 
 struct ExceptionCodeDescription {
     explicit ExceptionCodeDescription(ExceptionCode);
 
-    // |typeName| has spaces and is suitable for use in exception
-    // description strings; maximum length is 10 characters.
-    const char* typeName;
-
     // |name| is the exception name, also intended for use in exception
     // description strings; 0 if name not known; maximum length is 27
     // characters.
     const char* name;
 
     // |description| is the exception description, intended for use in
     // exception strings. It is a more readable explanation of error.
     const char* description;
 
     // |code| is the numeric value of the exception within a particular type.
@@ skipping 39 matching lines @@
 
     ASSERT_NOT_REACHED();
 }
 
 } // namespace WebCore
 """
 
 
 class ExceptionCodeDescriptionWriter(name_macros.Writer):
     defaults = {
-        'interfaceName': None,
+        'implementedAs': None,
         'conditional': None,
     }
     default_parameters = {
         'namespace': '',
     }
 
     def __init__(self, in_file_path, enabled_conditions):
         super(ExceptionCodeDescriptionWriter, self).__init__(in_file_path, enabled_conditions)
         self._outputs[(self.class_name + ".cpp")] = self.generate_implementation
         self._outputs[(self.class_name + ".h")] = self.generate_header
 
     def _exceptions(self):
         return self.in_file.name_dictionaries
 
     def _exception_type(self, exception):
-        name = os.path.basename(exception['name'])
-        return self.wrap_with_condition('    ' + name + 'Type,', exception['conditional'])
+        return self.wrap_with_condition('    ' + self._class_name_for_entry(exception) + 'Type,', exception['conditional'])
 
     def generate_header(self):
         return HEADER_TEMPLATE % {
             'license': license.license_for_generated_cpp(),
             'class_name': self.class_name,
             'exception_types': '\n'.join(map(self._exception_type, self._exceptions())),
         }
 
     def _include(self, exception):
-        include = '#include "' + exception['name'] + '.h"'
+        include = '#include "' + self._headers_header_include_path(exception) + '"'
         return self.wrap_with_condition(include, exception['conditional'])
 
     def _description_initalization(self, exception):
         name = os.path.basename(exception['name'])
-        if name == 'DOMCoreException':
-            return ''  # DOMCoreException needs to be last because it's a catch-all.
+        if name == 'DOMException':
+            return ''  # DOMException needs to be last because it's a catch-all.
         description_initalization = """    if (%(name)s::initializeDescription(ec, this))
         return;""" % {'name': name}
         return self.wrap_with_condition(description_initalization, exception['conditional'])
 
     def generate_implementation(self):
         return IMPLEMENTATION_TEMPLATE % {
             'license': license.license_for_generated_cpp(),
             'class_name': self.class_name,
             'includes': '\n'.join(map(self._include, self._exceptions())),
             'description_initalizations': '\n'.join(map(self._description_initalization, self._exceptions())),
         }
 
 
 if __name__ == "__main__":
     name_macros.Maker(ExceptionCodeDescriptionWriter).main(sys.argv)