Use EventHandler type instead of EventListener for event handler attributes

Source/bindings/scripts/deprecated_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 149 matching lines @@
                          "unsigned long" => 1,
                          "unsigned long long" => 1,
                          "float" => 1,
                          "double" => 1,
                         );
 
 my %nonWrapperTypes = ("CompareHow" => 1,
                        "DOMTimeStamp" => 1,
                        "Dictionary" => 1,
                        "EventListener" => 1,
+                       "EventHandler" => 1,
                        "MediaQueryListListener" => 1,
                        "NodeFilter" => 1,
                        "SerializedScriptValue" => 1,
                        "any" => 1,
                       );
 
 my %typedArrayHash = ("ArrayBuffer" => [],
                       "ArrayBufferView" => [],
                       "Uint8Array" => ["unsigned char", "v8::kExternalUnsignedByteArray"],
                       "Uint8ClampedArray" => ["unsigned char", "v8::kExternalPixelArray"],
@@ skipping 233 matching lines @@
     return 0;
 }
 
 sub AddIncludesForType
 {
     my $type = shift;
 
     return if SkipIncludeHeader($type);
 
     # Default includes
-    if ($type eq "EventListener") {
+    if ($type eq "EventListener" or $type eq "EventHandler") {
         AddToImplIncludes("core/dom/EventListener.h");
     } elsif ($type eq "SerializedScriptValue") {
         AddToImplIncludes("bindings/v8/SerializedScriptValue.h");
     } elsif ($type eq "any" || IsCallbackFunctionType($type)) {
         AddToImplIncludes("bindings/v8/ScriptValue.h");
     } elsif ($type eq "ArrayBuffer") {
         AddToImplIncludes("bindings/v8/custom/V8ArrayBufferCustom.h");
     } else {
         AddToImplIncludes("V8${type}.h");
     }
@@ skipping 471 matching lines @@
     return toV8(impl.get(), creationContext, isolate);
 }
 
 END
 
     if (IsConstructorTemplate($interface, "Event")) {
         $header{nameSpaceWebCore}->add("bool fill${implClassName}Init(${implClassName}Init&, const Dictionary&);\n\n");
     }
 }
 
-sub HasEventListenerAttribute
+sub HasEventHandlerAttribute
 {
     my $interface = shift;
 
     foreach my $attribute (@{$interface->attributes}) {
-        return 1 if $attribute->type eq "EventListener";
+        return 1 if $attribute->type eq "EventHandler";
     }
 
     return 0;
 }
 
 sub GetInternalFields
 {
     my $interface = shift;
 
     my @customInternalFields = ();
     # Event listeners on DOM nodes are explicitly supported in the GC controller.
     if (!InheritsInterface($interface, "Node") &&
-        (InheritsInterface($interface, "EventTarget") || HasEventListenerAttribute($interface))) {
+        (InheritsInterface($interface, "EventTarget") || HasEventHandlerAttribute($interface))) {
         push(@customInternalFields, "eventListenerCacheIndex");
     }
     return @customInternalFields;
 }
 
 sub GenerateHeaderCustomInternalFieldIndices
 {
     my $interface = shift;
     my @customInternalFields = GetInternalFields($interface);
     my $customFieldCounter = 0;
@@ skipping 483 matching lines @@
         $functionName = "${implClassName}::${functionName}";
     } else {
         $functionName = "imp->${functionName}";
     }
     my ($arg, $subCode) = GenerateCallWith($attribute->extendedAttributes->{"CallWith"}, "    ", 0);
     $code .= $subCode;
     unshift(@arguments, @$arg);
     $getterString = "${functionName}(" . join(", ", @arguments) . ")";
 
     my $expression;
-    if ($attribute->type eq "EventListener" && $interface->name eq "Window") {
+    if ($attribute->type eq "EventHandler" && $interface->name eq "Window") {
         $code .= "    if (!imp->document())\n";
         $code .= "        return;\n";
     }
 
     if ($useExceptions || $isNullable) {
         if ($nativeType =~ /^V8StringResource/) {
             $code .= "    " . ConvertToV8StringResource($attribute, $nativeType, "v", $getterString) . ";\n";
         } else {
             $code .= "    $nativeType v = $getterString;\n";
         }
@@ skipping 113 matching lines @@
         $code .= "    return;\n";
     } elsif ($attribute->type eq "SerializedScriptValue" && $attrExt->{"CachedAttribute"}) {
         my $getterFunc = ToMethodName($attribute->name);
         $code .= <<END;
     RefPtr<SerializedScriptValue> serialized = imp->${getterFunc}();
     value = serialized ? serialized->deserialize() : v8::Handle<v8::Value>(v8::Null(info.GetIsolate()));
     info.Holder()->SetHiddenValue(propertyName, value);
     v8SetReturnValue(info, value);
     return;
 END
-    } elsif ($attribute->type eq "EventListener") {
+    } elsif ($attribute->type eq "EventHandler") {
         AddToImplIncludes("bindings/v8/V8AbstractEventListener.h");
         my $getterFunc = ToMethodName($attribute->name);
         # FIXME: Pass the main world ID for main-world-only getters.
         $code .= "    EventListener* listener = imp->${getterFunc}(isolatedWorldForIsolate(info.GetIsolate()));\n";
         $code .= "    v8SetReturnValue(info, listener ? v8::Handle<v8::Value>(V8AbstractEventListener::cast(listener)->getListenerObject(imp->scriptExecutionContext())) : v8::Handle<v8::Value>(v8::Null(info.GetIsolate())));\n";
         $code .= "    return;\n";
     } else {
         my $nativeValue = NativeToJSValue($attribute->type, $attribute->extendedAttributes, $expression, "    ", "", "info.Holder()", "info.GetIsolate()", "info", "imp", $forMainWorldSuffix, "return");
         $code .= "${nativeValue}\n";
         $code .= "    return;\n";
@@ skipping 213 matching lines @@
         }
 
         if (!$attribute->isStatic) {
             $code .= <<END;
     ${implClassName}* imp = ${v8ClassName}::toNative(info.Holder());
 END
         }
     }
 
     my $nativeType = GetNativeType($attribute->type, $attribute->extendedAttributes, "parameter");
-    if ($attribute->type eq "EventListener") {
+    if ($attribute->type eq "EventHandler") {
         if ($interface->name eq "Window") {
             $code .= "    if (!imp->document())\n";
             $code .= "        return;\n";
         }
     } else {
         $code .= JSValueToNativeStatement($attribute->type, $attribute->extendedAttributes, "value", "v", "    ", "info.GetIsolate()");
     }
 
     if (IsEnumType($attrType)) {
         # setter ignores invalid enumeration values
@@ skipping 18 matching lines @@
 
     $code .= GenerateCustomElementInvocationScopeIfNeeded($attribute->extendedAttributes);
 
     my $useExceptions = 1 if $attribute->extendedAttributes->{"SetterRaisesException"} ||  $attribute->extendedAttributes->{"RaisesException"};
 
     if ($useExceptions) {
         AddToImplIncludes("bindings/v8/ExceptionState.h");
         $code .= "    ExceptionState es(info.GetIsolate());\n";
     }
 
-    if ($attribute->type eq "EventListener") {
+    if ($attribute->type eq "EventHandler") {
         my $implSetterFunctionName = FirstLetterToUpperCase($attrName);
         AddToImplIncludes("bindings/v8/V8AbstractEventListener.h");
         if (!InheritsInterface($interface, "Node")) {
             my $attrImplName = GetImplName($attribute);
             $code .= "    transferHiddenDependency(info.Holder(), imp->${attrImplName}(isolatedWorldForIsolate(info.GetIsolate())), value, ${v8ClassName}::eventListenerCacheIndex, info.GetIsolate());\n";
         }
         AddToImplIncludes("bindings/v8/V8EventListenerList.h");
         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>(value, true), isolatedWorldForIsolate(info.GetIsolate()));\n";
@@ skipping 2059 matching lines @@
         my $attrExt = $attribute->extendedAttributes;
 
         # Generate special code for the constructor attributes.
         if ($attrType =~ /Constructor$/) {
             if (!HasCustomGetter($attrExt)) {
                 $hasConstructors = 1;
             }
             next;
         }
 
-        if ($attrType eq "EventListener" && $interfaceName eq "Window") {
+        if ($attrType eq "EventHandler" && $interfaceName eq "Window") {
             $attrExt->{"OnProto"} = 1;
         }
 
         if ($attrType eq "SerializedScriptValue") {
             AddToImplIncludes("bindings/v8/SerializedScriptValue.h");
         }
 
         GenerateNormalAttrGetter($attribute, $interface, "");
         GenerateNormalAttrGetterCallback($attribute, $interface, "");
         if ($attrExt->{"PerWorldBindings"}) {
@@ skipping 2085 matching lines @@
         if ($currentInterface->extendedAttributes->{$extendedAttribute}) {
             $found = 1;
         }
         return 1 if $found;
     }, 0);
 
     return $found;
 }
 
 1;