IDL compiler: sync Python to r166688 (and clean up special operations+union code)

Source/bindings/templates/interface.cpp

 {% extends 'interface_base.cpp' %}
 
 
 {##############################################################################}
 {% macro attribute_configuration(attribute) %}
 {% set getter_callback =
        '%sV8Internal::%sAttributeGetterCallback' %
             (cpp_class, attribute.name)
        if not attribute.constructor_type else
        '{0}V8Internal::{0}ConstructorGetter'.format(cpp_class) %}
@@ skipping 110 matching lines @@
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block indexed_property_getter %}
 {% if indexed_property_getter and not indexed_property_getter.is_custom %}
 {% set getter = indexed_property_getter %}
 static void indexedPropertyGetter(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
-    {{cpp_class}}* collection = {{v8_class}}::toNative(info.Holder());
+    {{cpp_class}}* imp = {{v8_class}}::toNative(info.Holder());
     {% if getter.is_raises_exception %}
     ExceptionState exceptionState(info.Holder(), info.GetIsolate());
     {% endif %}
     {% set getter_name = getter.name or 'anonymousIndexedGetter' %}
     {% set getter_arguments = ['index', 'exceptionState']
            if getter.is_raises_exception else ['index'] %}
-    {{getter.cpp_type}} element = collection->{{getter_name}}({{getter_arguments|join(', ')}});
+    {{getter.cpp_type}} result = imp->{{getter_name}}({{getter_arguments|join(', ')}});
     {% if getter.is_raises_exception %}
     if (exceptionState.throwIfNeeded())
         return;
     {% endif %}
     if ({{getter.is_null_expression}})
         return;
     {{getter.v8_set_return_value}};
 }
 
 {% endif %}
@@ skipping 18 matching lines @@
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block indexed_property_setter %}
 {% if indexed_property_setter and not indexed_property_setter.is_custom %}
 {% set setter = indexed_property_setter %}
 static void indexedPropertySetter(uint32_t index, v8::Local<v8::Value> jsValue, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
-    {{cpp_class}}* collection = {{v8_class}}::toNative(info.Holder());
+    {{cpp_class}}* imp = {{v8_class}}::toNative(info.Holder());
     {{setter.v8_value_to_local_cpp_value}};
     {% if setter.has_exception_state %}
     ExceptionState exceptionState(info.Holder(), info.GetIsolate());
     {% endif %}
     {% if setter.has_strict_type_checking %}
     {# Type checking for interface types (if interface not implemented, throw
        TypeError), per http://www.w3.org/TR/WebIDL/#es-interface #}
     if (!isUndefinedOrNull(jsValue) && !V8{{setter.idl_type}}::hasInstance(jsValue, info.GetIsolate())) {
         exceptionState.throwTypeError("The provided value is not of type '{{setter.idl_type}}'.");
         exceptionState.throwIfNeeded();
         return;
     }
     {% endif %}
     {% set setter_name = setter.name or 'anonymousIndexedSetter' %}
     {% set setter_arguments = ['index', 'propertyValue', 'exceptionState']
            if setter.is_raises_exception else ['index', 'propertyValue'] %}
-    bool result = collection->{{setter_name}}({{setter_arguments|join(', ')}});
+    bool result = imp->{{setter_name}}({{setter_arguments|join(', ')}});
     {% if setter.is_raises_exception %}
     if (exceptionState.throwIfNeeded())
         return;
     {% endif %}
     if (!result)
         return;
     v8SetReturnValue(info, jsValue);
 }
 
 {% endif %}
@@ skipping 18 matching lines @@
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block indexed_property_deleter %}
 {% if indexed_property_deleter and not indexed_property_deleter.is_custom %}
 {% set deleter = indexed_property_deleter %}
 static void indexedPropertyDeleter(uint32_t index, const v8::PropertyCallbackInfo<v8::Boolean>& info)
 {
-    {{cpp_class}}* collection = {{v8_class}}::toNative(info.Holder());
+    {{cpp_class}}* imp = {{v8_class}}::toNative(info.Holder());
     {% if deleter.is_raises_exception %}
     ExceptionState exceptionState(info.Holder(), info.GetIsolate());
     {% endif %}
     {% set deleter_name = deleter.name or 'anonymousIndexedDeleter' %}
     {% set deleter_arguments = ['index', 'exceptionState']
            if deleter.is_raises_exception else ['index'] %}
-    DeleteResult result = collection->{{deleter_name}}({{deleter_arguments|join(', ')}});
+    DeleteResult result = imp->{{deleter_name}}({{deleter_arguments|join(', ')}});
     {% if deleter.is_raises_exception %}
     if (exceptionState.throwIfNeeded())
         return;
     {% endif %}
     if (result != DeleteUnknownProperty)
         return v8SetReturnValueBool(info, result == DeleteSuccess);
 }
 
 {% endif %}
 {% endblock %}
@@ skipping 12 matching lines @@
     {{cpp_class}}V8Internal::indexedPropertyDeleter(index, info);
     {% endif %}
     TRACE_EVENT_SET_SAMPLING_STATE("V8", "V8Execution");
 }
 
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
+{% from 'methods.cpp' import union_type_method_call %}
 {% block named_property_getter %}
 {% if named_property_getter and not named_property_getter.is_custom %}
 {% set getter = named_property_getter %}
 static void namedPropertyGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info)
 {
     {% if not is_override_builtins %}
     if (!info.Holder()->GetRealNamedPropertyInPrototypeChain(name).IsEmpty())
         return;
     if (info.Holder()->HasRealNamedCallbackProperty(name))
         return;
     if (info.Holder()->HasRealNamedProperty(name))
         return;
 
     {% endif %}
-    {{cpp_class}}* collection = {{v8_class}}::toNative(info.Holder());
+    {{cpp_class}}* imp = {{v8_class}}::toNative(info.Holder());
     AtomicString propertyName = toCoreAtomicString(name);
     {% if getter.is_raises_exception %}
     ExceptionState exceptionState(info.Holder(), info.GetIsolate());
     {% endif %}
-    {% set getter_name = getter.name or 'anonymousNamedGetter' %}
-    {% set getter_arguments = ['propertyName', 'exceptionState']
-           if getter.is_raises_exception else ['propertyName'] %}
     {% if getter.union_arguments %}
-    {% for cpp_type in getter.cpp_type %}
-    bool element{{loop.index0}}Enabled = false;
-    {{cpp_type}} element{{loop.index0}};
-    {% endfor %}
-    {% set getter_arguments = getter_arguments + getter.union_arguments %}
-    collection->{{getter_name}}({{getter_arguments|join(', ')}});
-    {% for v8_set_return_value in getter.v8_set_return_value %}
-    if (element{{loop.index0}}Enabled) {
-        {{v8_set_return_value}};
-        return;
-    }
-
-    {% endfor %}
-    return;
+    {{union_type_method_call(getter) | indent}}
     {% else %}
-    {{getter.cpp_type}} element = collection->{{getter_name}}({{getter_arguments|join(', ')}});
+    {{getter.cpp_type}} result = {{getter.cpp_value}};
     {% if getter.is_raises_exception %}
     if (exceptionState.throwIfNeeded())
         return;
     {% endif %}
     if ({{getter.is_null_expression}})
         return;
     {{getter.v8_set_return_value}};
     {% endif %}
 }
 
@@ skipping 28 matching lines @@
 {
     {% if not is_override_builtins %}
     if (!info.Holder()->GetRealNamedPropertyInPrototypeChain(name).IsEmpty())
         return;
     if (info.Holder()->HasRealNamedCallbackProperty(name))
         return;
     if (info.Holder()->HasRealNamedProperty(name))
         return;
 
     {% endif %}
-    {{cpp_class}}* collection = {{v8_class}}::toNative(info.Holder());
+    {{cpp_class}}* imp = {{v8_class}}::toNative(info.Holder());
     {# v8_value_to_local_cpp_value('DOMString', 'name', 'propertyName') #}
     V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, propertyName, name);
     {{setter.v8_value_to_local_cpp_value}};
     {% if setter.has_exception_state %}
     ExceptionState exceptionState(info.Holder(), info.GetIsolate());
     {% endif %}
     {% set setter_name = setter.name or 'anonymousNamedSetter' %}
     {% set setter_arguments =
            ['propertyName', 'propertyValue', 'exceptionState']
            if setter.is_raises_exception else
            ['propertyName', 'propertyValue'] %}
-    bool result = collection->{{setter_name}}({{setter_arguments|join(', ')}});
+    bool result = imp->{{setter_name}}({{setter_arguments|join(', ')}});
     {% if setter.is_raises_exception %}
     if (exceptionState.throwIfNeeded())
         return;
     {% endif %}
     if (!result)
         return;
     v8SetReturnValue(info, jsValue);
 }
 
 {% endif %}
@@ skipping 20 matching lines @@
 
 
 {##############################################################################}
 {% block named_property_query %}
 {% if named_property_getter and named_property_getter.is_enumerable and
       not named_property_getter.is_custom_property_query %}
 {# If there is an enumerator, there MUST be a query method to properly
    communicate property attributes. #}
 static void namedPropertyQuery(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Integer>& info)
 {
-    {{cpp_class}}* collection = {{v8_class}}::toNative(info.Holder());
+    {{cpp_class}}* imp = {{v8_class}}::toNative(info.Holder());
     AtomicString propertyName = toCoreAtomicString(name);
     ExceptionState exceptionState(info.Holder(), info.GetIsolate());
-    bool result = collection->namedPropertyQuery(propertyName, exceptionState);
+    bool result = imp->namedPropertyQuery(propertyName, exceptionState);
     if (exceptionState.throwIfNeeded())
         return;
     if (!result)
         return;
     v8SetReturnValueInt(info, v8::None);
 }
 
 {% endif %}
 {% endblock %}
 
@@ skipping 16 matching lines @@
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block named_property_deleter %}
 {% if named_property_deleter and not named_property_deleter.is_custom %}
 {% set deleter = named_property_deleter %}
 static void namedPropertyDeleter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Boolean>& info)
 {
-    {{cpp_class}}* collection = {{v8_class}}::toNative(info.Holder());
+    {{cpp_class}}* imp = {{v8_class}}::toNative(info.Holder());
     AtomicString propertyName = toCoreAtomicString(name);
     {% if deleter.is_raises_exception %}
     ExceptionState exceptionState(info.Holder(), info.GetIsolate());
     {% endif %}
     {% set deleter_name = deleter.name or 'anonymousNamedDeleter' %}
     {% set deleter_arguments = ['propertyName', 'exceptionState']
            if deleter.is_raises_exception else ['propertyName'] %}
-    DeleteResult result = collection->{{deleter_name}}({{deleter_arguments|join(', ')}});
+    DeleteResult result = imp->{{deleter_name}}({{deleter_arguments|join(', ')}});
     {% if deleter.is_raises_exception %}
     if (exceptionState.throwIfNeeded())
         return;
     {% endif %}
     if (result != DeleteUnknownProperty)
         return v8SetReturnValueBool(info, result == DeleteSuccess);
 }
 
 {% endif %}
 {% endblock %}
@@ skipping 17 matching lines @@
 {% endif %}
 {% endblock %}
 
 
 {##############################################################################}
 {% block named_property_enumerator %}
 {% if named_property_getter and named_property_getter.is_enumerable and
       not named_property_getter.is_custom_property_enumerator %}
 static void namedPropertyEnumerator(const v8::PropertyCallbackInfo<v8::Array>& info)
 {
-    {{cpp_class}}* collection = {{v8_class}}::toNative(info.Holder());
+    {{cpp_class}}* imp = {{v8_class}}::toNative(info.Holder());
     Vector<String> names;
     ExceptionState exceptionState(info.Holder(), info.GetIsolate());
-    collection->namedPropertyEnumerator(names, exceptionState);
+    imp->namedPropertyEnumerator(names, exceptionState);
     if (exceptionState.throwIfNeeded())
         return;
     v8::Handle<v8::Array> v8names = v8::Array::New(info.GetIsolate(), names.size());
     for (size_t i = 0; i < names.size(); ++i)
         v8names->Set(v8::Integer::New(info.GetIsolate(), i), v8String(info.GetIsolate(), names[i]));
     v8SetReturnValue(info, v8names);
 }
 
 {% endif %}
 {% endblock %}
@@ skipping 801 matching lines @@
     fromInternalPointer(object)->deref();
 }
 
 template<>
 v8::Handle<v8::Value> toV8NoInline({{cpp_class}}* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     return toV8(impl, creationContext, isolate);
 }
 
 {% endblock %}