Revert of Generate separate files for union type containers

third_party/WebKit/Source/bindings/scripts/v8_union.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import v8_types
 import v8_utilities
 
 
-UNION_CPP_INCLUDES = frozenset([
-    'bindings/core/v8/ToV8.h',
-])
-
 UNION_H_INCLUDES = frozenset([
     'bindings/core/v8/Dictionary.h',
     'bindings/core/v8/ExceptionState.h',
     'bindings/core/v8/V8Binding.h',
     'platform/heap/Handle.h',
 ])
 
 UNION_CPP_INCLUDES_BLACKLIST = frozenset([
     # This header defines static functions needed to implement event handler
     # attributes in interfaces that implement GlobalEventHandlers. They are not
     # needed or used by UnionTypes*.cpp, so including the header causes
     # compilation errors.
     # FIXME: We should solve this problem in a way that doesn't involve special-
     # casing a header like this.
     'core/dom/GlobalEventHandlers.h',
 ])
 
 
 cpp_includes = set()
 header_forward_decls = set()
 header_includes = set()
 
 
-def container_context(union_type, interfaces_info):
+def union_context(union_types, interfaces_info):
     cpp_includes.clear()
     header_forward_decls.clear()
     header_includes.clear()
-    cpp_includes.update(UNION_CPP_INCLUDES)
     header_includes.update(UNION_H_INCLUDES)
+
+    # For container classes we strip nullable wrappers. For example,
+    # both (A or B)? and (A? or B) will become AOrB. This should be OK
+    # because container classes can handle null and it seems that
+    # distinguishing (A or B)? and (A? or B) doesn't make sense.
+    container_cpp_types = set()
+    union_types_for_containers = set()
+    for union_type in union_types:
+        cpp_type = union_type.cpp_type
+        if cpp_type not in container_cpp_types:
+            union_types_for_containers.add(union_type)
+            container_cpp_types.add(cpp_type)
+
+    union_types_for_containers = sorted(union_types_for_containers,
+                                        key=lambda union_type: union_type.cpp_type)
+
+    return {
+        'containers': [container_context(union_type, interfaces_info)
+                       for union_type in union_types_for_containers],
+        'cpp_includes': sorted(cpp_includes - UNION_CPP_INCLUDES_BLACKLIST),
+        'header_forward_decls': sorted(header_forward_decls),
+        'header_includes': sorted(header_includes),
+    }
+
+
+def container_context(union_type, interfaces_info):
     members = []
 
     # These variables refer to member contexts if the given union type has
     # corresponding types. They are used for V8 -> impl conversion.
     array_buffer_type = None
     array_buffer_view_type = None
     array_or_sequence_type = None
     boolean_type = None
     dictionary_type = None
     interface_types = []
@@ skipping 35 matching lines @@
         else:
             raise Exception('%s is not supported as an union member.' % member.name)
 
     # Nullable restriction checks
     nullable_members = union_type.number_of_nullable_member_types
     if nullable_members > 1:
         raise Exception('%s contains more than one nullable members' % union_type.name)
     if dictionary_type and nullable_members == 1:
         raise Exception('%s has a dictionary and a nullable member' % union_type.name)
 
-    cpp_class = union_type.cpp_type
     return {
         'array_buffer_type': array_buffer_type,
         'array_buffer_view_type': array_buffer_view_type,
         'array_or_sequence_type': array_or_sequence_type,
         'boolean_type': boolean_type,
-        'cpp_class': cpp_class,
-        'cpp_includes': sorted(cpp_includes - UNION_CPP_INCLUDES_BLACKLIST),
+        'cpp_class': union_type.cpp_type,
         'dictionary_type': dictionary_type,
-        'header_includes': sorted(header_includes),
-        'header_forward_decls': sorted(header_forward_decls),
         'includes_nullable_type': union_type.includes_nullable_type,
         'interface_types': interface_types,
         'members': members,
         'numeric_type': numeric_type,
         'object_type': object_type,
         'string_type': string_type,
         'type_string': str(union_type),
-        'v8_class': v8_types.v8_type(cpp_class),
     }
 
 
 def _update_includes_and_forward_decls(member, interface_info):
     if interface_info:
         cpp_includes.update(interface_info.get(
             'dependencies_include_paths', []))
-        # We need complete types for IDL dictionaries in union containers.
+        # TODO(bashi): Workaround for http://crbug.com/524424
+        # Avoid using forward declaration for IDL dictionaries so that they
+        # aren't imcomplete types in UnionTypes.h. This enables an IDL
+        # dictionary to have a union type which has an IDL dictionary. e.g.
+        #   dictionary DictA { (boolean or DictB) member; }
+        # Note that this doesn't cover all cases. We still can't use an IDL
+        # dictionary in a union type when the dictionary contains a union type.
+        # e.g.
+        #   void foo((DOMString or DictA) arg);  // won't compile
         if member.is_dictionary:
             header_includes.update(member.includes_for_type())
         else:
             cpp_includes.update(member.includes_for_type())
             header_forward_decls.add(member.implemented_as)
     else:
         cpp_includes.update(member.includes_for_type())
 
 
 def member_context(member, interfaces_info):
@@ skipping 10 matching lines @@
             creation_context='creationContext'),
         'enum_values': member.enum_values,
         'is_traceable': member.is_traceable,
         'rvalue_cpp_type': member.cpp_type_args(used_as_rvalue_type=True),
         'specific_type_enum': 'SpecificType' + member.name,
         'type_name': member.name,
         'v8_value_to_local_cpp_value': member.v8_value_to_local_cpp_value(
             {}, 'v8Value', 'cppValue', isolate='isolate',
             use_exception_state=True, restricted_float=True),
     }