IDL compiler: sync Python to r166999

Source/bindings/templates/methods.cpp

 {##############################################################################}
 {% macro generate_method(method, world_suffix) %}
 {% filter conditional(method.conditional_string) %}
 static void {{method.name}}{{method.overload_index}}Method{{world_suffix}}(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     {% if method.has_exception_state %}
     ExceptionState exceptionState(ExceptionState::ExecutionContext, "{{method.name}}", "{{interface_name}}", info.Holder(), info.GetIsolate());
     {% endif %}
+    {% if method.name in ['addEventListener', 'removeEventListener',
+                          'dispatchEvent'] %}
+    {{add_event_listener_remove_event_listener_dispatch_event() | indent}}
+    {% endif %}
     {% if method.name in ['addEventListener', 'removeEventListener'] %}
-    {{add_remove_event_listener_method(method.name) | indent}}
+    {{add_event_listener_remove_event_listener_method(method.name) | indent}}
     {% else %}
     {% if method.number_of_required_arguments %}
     if (UNLIKELY(info.Length() < {{method.number_of_required_arguments}})) {
         {{throw_type_error(method,
               'ExceptionMessages::notEnoughArguments(%s, info.Length())' %
                   method.number_of_required_arguments) | indent(8)}}
         return;
     }
     {% endif %}
     {% if not method.is_static %}
@@ skipping 23 matching lines @@
     {% else %}
     {{cpp_method_call(method, method.v8_set_return_value, method.cpp_value) | indent}}
     {% endif %}
     {% endif %}{# addEventListener, removeEventListener #}
 }
 {% endfilter %}
 {% endmacro %}
 
 
 {######################################}
-{% macro add_remove_event_listener_method(method_name) %}
-{# Set template values for addEventListener vs. removeEventListener #}
-{% set listener_lookup_type, listener, hidden_dependency_action =
-    ('ListenerFindOrCreate', 'listener', 'addHiddenValueToArray')
-    if method_name == 'addEventListener' else
-    ('ListenerFindOnly', 'listener.get()', 'removeHiddenValueFromArray')
-%}
+{% macro add_event_listener_remove_event_listener_dispatch_event() %}
+{# FIXME: Clean up: use the normal |imp| above,
+          use the existing shouldAllowAccessToFrame check if possible. #}
 EventTarget* impl = {{v8_class}}::toNative(info.Holder());
 if (DOMWindow* window = impl->toDOMWindow()) {
     if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), window->frame(), exceptionState)) {
         exceptionState.throwIfNeeded();
         return;
     }
     if (!window->document())
         return;
 }
+{% endmacro %}
+
+
+{######################################}
+{% macro add_event_listener_remove_event_listener_method(method_name) %}
+{# Set template values for addEventListener vs. removeEventListener #}
+{% set listener_lookup_type, listener, hidden_dependency_action =
+    ('ListenerFindOrCreate', 'listener', 'addHiddenValueToArray')
+    if method_name == 'addEventListener' else
+    ('ListenerFindOnly', 'listener.get()', 'removeHiddenValueFromArray')
+%}
 RefPtr<EventListener> listener = V8EventListenerList::getEventListener(info[1], false, {{listener_lookup_type}});
 if (listener) {
     V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>, eventName, info[0]);
     impl->{{method_name}}(eventName, {{listener}}, info[2]->BooleanValue());
     if (!impl->toNode())
         {{hidden_dependency_action}}(info.Holder(), info[1], {{v8_class}}::eventListenerCacheIndex, info.GetIsolate());
 }
 {% endmacro %}
 
 
@@ skipping 344 matching lines @@
     v8::Handle<v8::Object> wrapper = info.Holder();
     {% if is_constructor_raises_exception %}
     if (exceptionState.throwIfNeeded())
         return;
     {% endif %}
 
     V8DOMWrapper::associateObjectWithWrapper<{{v8_class}}>(impl.release(), &{{v8_class}}Constructor::wrapperTypeInfo, wrapper, info.GetIsolate(), WrapperConfiguration::Dependent);
     v8SetReturnValue(info, wrapper);
 }
 {% endmacro %}