Changes for webkit roll 148757-149482

tools/dom/scripts/idlnode.py

 #!/usr/bin/python
 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 import os
 import sys
 
 
 class IDLNode(object):
@@ skipping 391 matching lines @@
 
   def __init__(self, ast):
     IDLNode.__init__(self, ast)
     self._convert_ext_attrs(ast)
     self._convert_annotations(ast)
     self.parents = self._convert_all(ast, 'ParentInterface',
       IDLParentInterface)
     javascript_interface_name = self.ext_attrs.get('InterfaceName', self.id)
     self.javascript_binding_name = javascript_interface_name
     self.doc_js_name = javascript_interface_name
+
+    if not (self._find_first(ast, 'Callback') is None):
+      self.ext_attrs['Callback'] = None
+    if not (self._find_first(ast, 'Partial') is None):
+      self.is_supplemental = True
+      self.ext_attrs['Supplemental'] = None
+
     self.operations = self._convert_all(ast, 'Operation',
       lambda ast: IDLOperation(ast, self.doc_js_name))
     self.attributes = self._convert_all(ast, 'Attribute',
       lambda ast: IDLAttribute(ast, self.doc_js_name))
     self.constants = self._convert_all(ast, 'Const',
       lambda ast: IDLConstant(ast, self.doc_js_name))
     self.is_supplemental = 'Supplemental' in self.ext_attrs
     self.is_no_interface_object = 'NoInterfaceObject' in self.ext_attrs
     self.is_fc_suppressed = 'Suppressed' in self.ext_attrs
 
+
   def reset_id(self, new_id):
     """Reset the id of the Interface and corresponding the JS names."""
     if self.id != new_id:
       self.id = new_id
       self.doc_js_name = new_id
       self.javascript_binding_name = new_id
       for member in self.operations:
         member.doc_js_interface_name = new_id
       for member in self.attributes:
         member.doc_js_interface_name = new_id
@@ skipping 60 matching lines @@
     self.value = self._find_first(ast, 'ConstExpr')
 
 
 class IDLArgument(IDLNode):
   """IDLNode specialization for operation arguments."""
   def __init__(self, ast):
     IDLNode.__init__(self, ast)
     self.type = self._convert_first(ast, 'Type', IDLType)
     self.optional = self._has(ast, 'Optional')
     self._convert_ext_attrs(ast)
+    # TODO(vsm): Recover this from the type instead.
+    if 'Callback' in self.type.id:
+      self.ext_attrs['Callback'] = None
 
   def __repr__(self):
     return '<IDLArgument(type = %s, id = %s)>' % (self.type, self.id)
 
 
 class IDLImplementsStatement(IDLNode):
   """IDLNode specialization for 'X implements Y' declarations."""
   def __init__(self, ast):
     IDLNode.__init__(self, ast)
     self.implementor = self._convert_first(ast, 'ImplStmtImplementor',
@@ skipping 19 matching lines @@
   """IDLDictNode specialization for one annotation."""
   def __init__(self, ast=None):
     IDLDictNode.__init__(self, ast)
     self.id = None
     if not ast:
       return
     for arg in self._find_all(ast, 'AnnotationArg'):
       name = self._find_first(arg, 'Id')
       value = self._find_first(arg, 'AnnotationArgValue')
       self[name] = value