Generate separate files for union type containers

third_party/WebKit/Source/bindings/templates/union_container.cpp

Index: third_party/WebKit/Source/bindings/templates/union_container.cpp
diff --git a/third_party/WebKit/Source/bindings/templates/union.cpp b/third_party/WebKit/Source/bindings/templates/union_container.cpp
similarity index 53%
rename from third_party/WebKit/Source/bindings/templates/union.cpp
rename to third_party/WebKit/Source/bindings/templates/union_container.cpp
index 534ceaae56df598f8ff702c509285a5a1a34c107..a2ccae1113065d2413ba287349188430563a2fd2 100644
--- a/third_party/WebKit/Source/bindings/templates/union.cpp
+++ b/third_party/WebKit/Source/bindings/templates/union_container.cpp
@@ -1,6 +1,6 @@
 {% from 'utilities.cpp' import declare_enum_validation_variable %}
 {% include 'copyright_block.txt' %}
-#include "{{header_filename}}"
+#include "{{cpp_class}}.h"
 
 {% from 'utilities.cpp' import v8_value_to_local_cpp_value %}
 {% macro assign_and_return_if_hasinstance(member) %}
@@ -16,20 +16,19 @@ if (V8{{member.type_name}}::hasInstance(v8Value, isolate)) {
 
 namespace blink {
 
-{% for container in containers %}
-{{container.cpp_class}}::{{container.cpp_class}}()
+{{cpp_class}}::{{cpp_class}}()
     : m_type(SpecificTypeNone)
 {
 }
 
-{% for member in container.members %}
-{{member.rvalue_cpp_type}} {{container.cpp_class}}::getAs{{member.type_name}}() const
+{% for member in members %}
+{{member.rvalue_cpp_type}} {{cpp_class}}::getAs{{member.type_name}}() const
 {
     ASSERT(is{{member.type_name}}());
     return m_{{member.cpp_name}};
 }
 
-void {{container.cpp_class}}::set{{member.type_name}}({{member.rvalue_cpp_type}} value)
+void {{cpp_class}}::set{{member.type_name}}({{member.rvalue_cpp_type}} value)
 {
     ASSERT(isNull());
     {% if member.enum_values %}
@@ -44,26 +43,26 @@ void {{container.cpp_class}}::set{{member.type_name}}({{member.rvalue_cpp_type}}
     m_type = {{member.specific_type_enum}};
 }
 
-{{container.cpp_class}} {{container.cpp_class}}::from{{member.type_name}}({{member.rvalue_cpp_type}} value)
+{{cpp_class}} {{cpp_class}}::from{{member.type_name}}({{member.rvalue_cpp_type}} value)
 {
-    {{container.cpp_class}} container;
+    {{cpp_class}} container;
     container.set{{member.type_name}}(value);
     return container;
 }
 
 {% endfor %}
-{{container.cpp_class}}::{{container.cpp_class}}(const {{container.cpp_class}}&) = default;
-{{container.cpp_class}}::~{{container.cpp_class}}() = default;
-{{container.cpp_class}}& {{container.cpp_class}}::operator=(const {{container.cpp_class}}&) = default;
+{{cpp_class}}::{{cpp_class}}(const {{cpp_class}}&) = default;
+{{cpp_class}}::~{{cpp_class}}() = default;
+{{cpp_class}}& {{cpp_class}}::operator=(const {{cpp_class}}&) = default;
 
-DEFINE_TRACE({{container.cpp_class}})
+DEFINE_TRACE({{cpp_class}})
 {
-    {% for member in container.members if member.is_traceable %}
+    {% for member in members if member.is_traceable %}
     visitor->trace(m_{{member.cpp_name}});
     {% endfor %}
 }
 
-void V8{{container.cpp_class}}::toImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value, {{container.cpp_class}}& impl, UnionTypeConversionMode conversionMode, ExceptionState& exceptionState)
+void {{v8_class}}::toImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value, {{cpp_class}}& impl, UnionTypeConversionMode conversionMode, ExceptionState& exceptionState)
 {
     if (v8Value.IsEmpty())
         return;
@@ -75,57 +74,57 @@ void V8{{container.cpp_class}}::toImpl(v8::Isolate* isolate, v8::Local<v8::Value
         return;
 
     {# 3. Platform objects (interfaces) #}
-    {% for interface in container.interface_types %}
+    {% for interface in interface_types %}
     {{assign_and_return_if_hasinstance(interface) | indent}}
 
     {% endfor %}
     {# 8. ArrayBuffer #}
-    {% if container.array_buffer_type %}
-    {{assign_and_return_if_hasinstance(container.array_buffer_type) | indent}}
+    {% if array_buffer_type %}
+    {{assign_and_return_if_hasinstance(array_buffer_type) | indent}}
 
     {% endif %}
     {# 9., 10. ArrayBufferView #}
     {# FIXME: Individual typed arrays (e.g. Uint8Array) aren't supported yet. #}
-    {% if container.array_buffer_view_type %}
-    {{assign_and_return_if_hasinstance(container.array_buffer_view_type) | indent}}
+    {% if array_buffer_view_type %}
+    {{assign_and_return_if_hasinstance(array_buffer_view_type) | indent}}
 
     {% endif %}
-    {% if container.dictionary_type %}
+    {% if dictionary_type %}
     {# 12. Dictionaries #}
     {# FIXME: This should also check "object but not Date or RegExp". Add checks
        when we implement conversions for Date and RegExp. #}
     if (isUndefinedOrNull(v8Value) || v8Value->IsObject()) {
-        {{v8_value_to_local_cpp_value(container.dictionary_type) | indent(8)}}
-        impl.set{{container.dictionary_type.type_name}}(cppValue);
+        {{v8_value_to_local_cpp_value(dictionary_type) | indent(8)}}
+        impl.set{{dictionary_type.type_name}}(cppValue);
         return;
     }
 
     {% endif %}
-    {% if container.array_or_sequence_type %}
+    {% if array_or_sequence_type %}
     {# 13.1, 13.2. Arrays and Sequences #}
     {# FIXME: This should also check "object but not Date or RegExp". Add checks
        when we implement conversions for Date and RegExp. #}
     {# FIXME: Should check for sequences too, not just Array instances. #}
     if (v8Value->IsArray()) {
-        {{v8_value_to_local_cpp_value(container.array_or_sequence_type) | indent(8)}}
-        impl.set{{container.array_or_sequence_type.type_name}}(cppValue);
+        {{v8_value_to_local_cpp_value(array_or_sequence_type) | indent(8)}}
+        impl.set{{array_or_sequence_type.type_name}}(cppValue);
         return;
     }
 
     {% endif %}
     {# TODO(bashi): Support 13.3 Callback interface when we need it #}
     {# 13.4. Objects #}
-    {% if container.object_type %}
+    {% if object_type %}
     if (isUndefinedOrNull(v8Value) || v8Value->IsObject()) {
-        {{v8_value_to_local_cpp_value(container.object_type) | indent(8)}}
-        impl.set{{container.object_type.type_name}}(cppValue);
+        {{v8_value_to_local_cpp_value(object_type) | indent(8)}}
+        impl.set{{object_type.type_name}}(cppValue);
         return;
     }
 
     {% endif %}
     {# FIXME: In some cases, we can omit boolean and numeric type checks because
        we have fallback conversions. (step 17 and 18) #}
-    {% if container.boolean_type %}
+    {% if boolean_type %}
     {# 14. Boolean #}
     if (v8Value->IsBoolean()) {
         impl.setBoolean(v8Value.As<v8::Boolean>()->Value());
@@ -133,38 +132,38 @@ void V8{{container.cpp_class}}::toImpl(v8::Isolate* isolate, v8::Local<v8::Value
     }
 
     {% endif %}
-    {% if container.numeric_type %}
+    {% if numeric_type %}
     {# 15. Number #}
     if (v8Value->IsNumber()) {
-        {{v8_value_to_local_cpp_value(container.numeric_type) | indent(8)}}
-        impl.set{{container.numeric_type.type_name}}(cppValue);
+        {{v8_value_to_local_cpp_value(numeric_type) | indent(8)}}
+        impl.set{{numeric_type.type_name}}(cppValue);
         return;
     }
 
     {% endif %}
-    {% if container.string_type %}
+    {% if string_type %}
     {# 16. String #}
     {
-        {{v8_value_to_local_cpp_value(container.string_type) | indent(8)}}
-        {% if container.string_type.enum_values %}
-        {{declare_enum_validation_variable(container.string_type.enum_values) | indent(8)}}
-        if (!isValidEnum(cppValue, validValues, WTF_ARRAY_LENGTH(validValues), "{{container.string_type.type_name}}", exceptionState))
+        {{v8_value_to_local_cpp_value(string_type) | indent(8)}}
+        {% if string_type.enum_values %}
+        {{declare_enum_validation_variable(string_type.enum_values) | indent(8)}}
+        if (!isValidEnum(cppValue, validValues, WTF_ARRAY_LENGTH(validValues), "{{string_type.type_name}}", exceptionState))
             return;
         {% endif %}
-        impl.set{{container.string_type.type_name}}(cppValue);
+        impl.set{{string_type.type_name}}(cppValue);
         return;
     }
 
     {# 17. Number (fallback) #}
-    {% elif container.numeric_type %}
+    {% elif numeric_type %}
     {
-        {{v8_value_to_local_cpp_value(container.numeric_type) | indent(8)}}
-        impl.set{{container.numeric_type.type_name}}(cppValue);
+        {{v8_value_to_local_cpp_value(numeric_type) | indent(8)}}
+        impl.set{{numeric_type.type_name}}(cppValue);
         return;
     }
 
     {# 18. Boolean (fallback) #}
-    {% elif container.boolean_type %}
+    {% elif boolean_type %}
     {
         impl.setBoolean(v8Value->BooleanValue());
         return;
@@ -172,18 +171,18 @@ void V8{{container.cpp_class}}::toImpl(v8::Isolate* isolate, v8::Local<v8::Value
 
     {% else %}
     {# 19. TypeError #}
-    exceptionState.throwTypeError("The provided value is not of type '{{container.type_string}}'");
+    exceptionState.throwTypeError("The provided value is not of type '{{type_string}}'");
     {% endif %}
 }
 
-v8::Local<v8::Value> toV8(const {{container.cpp_class}}& impl, v8::Local<v8::Object> creationContext, v8::Isolate* isolate)
+v8::Local<v8::Value> toV8(const {{cpp_class}}& impl, v8::Local<v8::Object> creationContext, v8::Isolate* isolate)
 {
     switch (impl.m_type) {
-    case {{container.cpp_class}}::SpecificTypeNone:
+    case {{cpp_class}}::SpecificTypeNone:
         {# FIXME: We might want to return undefined in some cases #}
         return v8::Null(isolate);
-    {% for member in container.members %}
-    case {{container.cpp_class}}::{{member.specific_type_enum}}:
+    {% for member in members %}
+    case {{cpp_class}}::{{member.specific_type_enum}}:
         return {{member.cpp_value_to_v8_value}};
     {% endfor %}
     default:
@@ -192,12 +191,11 @@ v8::Local<v8::Value> toV8(const {{container.cpp_class}}& impl, v8::Local<v8::Obj
     return v8::Local<v8::Value>();
 }
 
-{{container.cpp_class}} NativeValueTraits<{{container.cpp_class}}>::nativeValue(v8::Isolate* isolate, v8::Local<v8::Value> value, ExceptionState& exceptionState)
+{{cpp_class}} NativeValueTraits<{{cpp_class}}>::nativeValue(v8::Isolate* isolate, v8::Local<v8::Value> value, ExceptionState& exceptionState)
 {
-    {{container.cpp_class}} impl;
-    V8{{container.cpp_class}}::toImpl(isolate, value, impl, UnionTypeConversionMode::NotNullable, exceptionState);
+    {{cpp_class}} impl;
+    {{v8_class}}::toImpl(isolate, value, impl, UnionTypeConversionMode::NotNullable, exceptionState);
     return impl;
 }
 
-{% endfor %}
 } // namespace blink