Merge 38 changes to bleeding edge

tools/dom/scripts/idlnode.py

Index: tools/dom/scripts/idlnode.py
diff --git a/tools/dom/scripts/idlnode.py b/tools/dom/scripts/idlnode.py
index efe0bf102150f4497f7f8ca296fdb284d2a23d7d..fff5e34b50d7d56aeed8f28c25248d8a44129109 100755
--- a/tools/dom/scripts/idlnode.py
+++ b/tools/dom/scripts/idlnode.py
@@ -7,7 +7,7 @@ import os
 import sys
 
 import idl_definitions
-from idl_types import IdlType, IdlUnionType
+from idl_types import IdlType, IdlUnionType, IdlArrayOrSequenceType
 
 from compute_interfaces_info_overall import interfaces_info
 
@@ -547,7 +547,7 @@ class IDLType(IDLNode):
       self.id = ast
     # New blink handling.
     elif ast.__module__ == "idl_types":
-      if isinstance(ast, IdlType):
+      if isinstance(ast, IdlType) or isinstance(ast, IdlArrayOrSequenceType):
         type_name = str(ast)
 
         # TODO(terry): For now don't handle unrestricted types see
@@ -560,7 +560,8 @@ class IDLType(IDLNode):
         self.id = type_name
       else:
         # IdlUnionType
-        assert ast.is_union_type
+        if ast.is_union_type:
+          print 'WARNING type %s is union mapped to \'any\'' % self.id
         # TODO(terry): For union types use any otherwise type is unionType is
         #              not found and is removed during merging.
         self.id = 'any'