Unify the GlobalEventHandlers list on the C++ side

Source/bindings/scripts/code_generator_v8.pm

 # Copyright (C) 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
 # Copyright (C) 2006 Anders Carlsson <andersca@mac.com>
 # Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
 # Copyright (C) 2006 Alexey Proskuryakov <ap@webkit.org>
 # Copyright (C) 2006 Apple Computer, Inc.
 # Copyright (C) 2007, 2008, 2009, 2012 Google Inc.
 # Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
 # Copyright (C) Research In Motion Limited 2010. All rights reserved.
 # Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
 # Copyright (C) 2012 Ericsson AB. All rights reserved.
@@ skipping 1617 matching lines @@
         } else {
             $code .= <<END;
     ScriptValue jsValue = $getterString;
     info.Holder()->SetHiddenValue(propertyName, jsValue.v8Value());
     v8SetReturnValue(info, jsValue.v8Value());
 END
         }
     } elsif ($attribute->type eq "EventHandler") {
         AddToImplIncludes("bindings/v8/V8AbstractEventListener.h");
         my $getterFunc = ToMethodName($attribute->name);
+        my $getterString;
         # FIXME: Pass the main world ID for main-world-only getters.
-        $code .= "    EventListener* jsValue = imp->${getterFunc}(isolatedWorldForIsolate(info.GetIsolate()));\n";
+        my $implementedBy = $attribute->extendedAttributes->{"ImplementedBy"};
+        if ($implementedBy) {
+            my $implementedByImplName = GetImplNameFromImplementedBy($implementedBy);
+            $getterString = "${implementedByImplName}::${getterFunc}(imp, isolatedWorldForIsolate(info.GetIsolate()))";
+        } else {
+            $getterString = "imp->${getterFunc}(isolatedWorldForIsolate(info.GetIsolate()))";
+        }
+        $code .= "    EventListener* jsValue = ${getterString};\n";
         $code .= "    v8SetReturnValue(info, jsValue ? v8::Handle<v8::Value>(V8AbstractEventListener::cast(jsValue)->getListenerObject(imp->executionContext())) : v8::Handle<v8::Value>(v8::Null(info.GetIsolate())));\n";
     } else {
         my $nativeValue = NativeToJSValue($attribute->type, $attribute->extendedAttributes, $expression, "    ", "", "info.Holder()", "info.GetIsolate()", "info", "imp", $forMainWorldSuffix, "return");
         $code .= "${nativeValue}\n";
     }
 
     $code .= "}\n";  # end of getter
     $code .= "#endif // ${conditionalString}\n" if $conditionalString;
     $code .= "\n";
     $implementation{nameSpaceInternal}->add($code);
@@ skipping 298 matching lines @@
     my $useExceptions = 1 if $attribute->extendedAttributes->{"SetterRaisesException"} ||  $attribute->extendedAttributes->{"RaisesException"};
 
     if ($useExceptions) {
         AddToImplIncludes("bindings/v8/ExceptionMessages.h");
         AddToImplIncludes("bindings/v8/ExceptionState.h");
         $code .= "    ExceptionState es(info.GetIsolate());\n";
     }
 
     if ($attribute->type eq "EventHandler") {
         my $implSetterFunctionName = FirstLetterToUpperCase($attrName);
-        if (!InheritsInterface($interface, "Node")) {
-            my $attrImplName = GetImplName($attribute);
-            $code .= "    transferHiddenDependency(info.Holder(), imp->${attrImplName}(isolatedWorldForIsolate(info.GetIsolate())), jsValue, ${v8ClassName}::eventListenerCacheIndex, info.GetIsolate());\n";
-        }
-        if (($interfaceName eq "Window" or $interfaceName eq "WorkerGlobalScope") and $attribute->name eq "onerror") {
-            AddToImplIncludes("bindings/v8/V8ErrorHandler.h");
-            $code .= "    imp->set$implSetterFunctionName(V8EventListenerList::findOrCreateWrapper<V8ErrorHandler>(jsValue, true, info.GetIsolate()), isolatedWorldForIsolate(info.GetIsolate()));\n";
+        my $implementedBy = $attribute->extendedAttributes->{"ImplementedBy"};
+        if ($implementedBy) {
+            my $implementedByImplName = GetImplNameFromImplementedBy($implementedBy);
+            if (!InheritsInterface($interface, "Node")) {
+                my $attrImplName = GetImplName($attribute);
+                $code .= "    transferHiddenDependency(info.Holder(), ${implementedByImplName}::${attrImplName}(imp, isolatedWorldForIsolate(info.GetIsolate())), jsValue, ${v8ClassName}::eventListenerCacheIndex, info.GetIsolate());\n";
+            }
+            if (($interfaceName eq "Window" or $interfaceName eq "WorkerGlobalScope") and $attribute->name eq "onerror") {
+                AddToImplIncludes("bindings/v8/V8ErrorHandler.h");
+                $code .= "    ${implementedByImplName}::set$implSetterFunctionName(imp, V8EventListenerList::findOrCreateWrapper<V8ErrorHandler>(jsValue, true, info.GetIsolate()), isolatedWorldForIsolate(info.GetIsolate()));\n";
+            } else {
+                $code .= "    ${implementedByImplName}::set$implSetterFunctionName(imp, V8EventListenerList::getEventListener(jsValue, true, ListenerFindOrCreate), isolatedWorldForIsolate(info.GetIsolate()));\n";
+            }
         } else {

[Nils Barth (inactive), 2013/10/24 02:41:39]

You might be able to avoid having multiple branches
by having a $setterFunctionName variable?

-            $code .= "    imp->set$implSetterFunctionName(V8EventListenerList::getEventListener(jsValue, true, ListenerFindOrCreate), isolatedWorldForIsolate(info.GetIsolate()));\n";
+            if (!InheritsInterface($interface, "Node")) {

[Nils Barth (inactive), 2013/10/24 02:41:39]

I think you can make this section simpler by having a list of setter
arguments, so you don't have to write out:
V8EventListenerList::findOrCreateWrapper<V8ErrorHandler>(jsValue, true,
info.GetIsolate()),
isolatedWorldForIsolate(info.GetIsolate())
...several times.
Alternatively, you could at least have $wrapper and $isolatedWorld.

+                my $attrImplName = GetImplName($attribute);
+                $code .= "    transferHiddenDependency(info.Holder(), imp->${attrImplName}(isolatedWorldForIsolate(info.GetIsolate())), jsValue, ${v8ClassName}::eventListenerCacheIndex, info.GetIsolate());\n";
+            }
+            if (($interfaceName eq "Window" or $interfaceName eq "WorkerGlobalScope") and $attribute->name eq "onerror") {
+                AddToImplIncludes("bindings/v8/V8ErrorHandler.h");
+                $code .= "    imp->set$implSetterFunctionName(V8EventListenerList::findOrCreateWrapper<V8ErrorHandler>(jsValue, true, info.GetIsolate()), isolatedWorldForIsolate(info.GetIsolate()));\n";
+            } else {
+                $code .= "    imp->set$implSetterFunctionName(V8EventListenerList::getEventListener(jsValue, true, ListenerFindOrCreate), isolatedWorldForIsolate(info.GetIsolate()));\n";
+            }
         }
     } else {
         my ($functionName, @arguments) = SetterExpression($interfaceName, $attribute);
         push(@arguments, $expression);
         push(@arguments, "es") if $useExceptions;
         if ($attribute->extendedAttributes->{"ImplementedBy"}) {
             my $implementedBy = $attribute->extendedAttributes->{"ImplementedBy"};
             my $implementedByImplName = GetImplNameFromImplementedBy($implementedBy);
             AddToImplIncludes(HeaderFilesForInterface($implementedBy, $implementedByImplName));
             unshift(@arguments, "imp") if !$attribute->isStatic;
@@ skipping 4217 matching lines @@
     my $interface = shift;
 
     return 1 if $interface->extendedAttributes->{"CustomToV8"};
     return 1 if $interface->extendedAttributes->{"SpecialWrapFor"};
     return 1 if InheritsInterface($interface, "Document");
 
     return 0;
 }
 
 1;