<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[181001] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/181001">181001</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2015-03-04 09:30:32 -0800 (Wed, 04 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make JavaScript binding get and set legacy event listener attributes directly
https://bugs.webkit.org/show_bug.cgi?id=142282
Reviewed by Sam Weinig.
Test: fast/dom/legacy-event-handler-attributes.html
This patch changes the JavaScript getters and setters for these attributes
to work directly without requiring any functions in the C++ DOM implementation.
A subsequent patch will remove the now-unused C++ DOM implementation.
* bindings/js/JSEventListener.cpp:
(WebCore::legacyEventListenerAttribute): Added.
(WebCore::createEventListenerForLegacyAttribute): Added.
(WebCore::setLegacyEventListenerAttribute): Added.
(WebCore::legacyWindowEventListenerAttribute): Added.
(WebCore::setLegacyWindowEventListenerAttribute): Added.
* bindings/js/JSEventListener.h:
(WebCore::createJSEventListenerForAttribute): Deleted.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateAttributeEventListenerCall): Deleted.
(LegacyEventListenerAttributeEventName): Added.
(LegacyEventListenerAttributePrefix): Added.
(GenerateImplementation): Use "auto" in lots of places to simplify the code
generation. Replaced the old inlined code to deal with legacy event listener
attributes with code that simply calls the new functions from JSEventLister.h.
(GenerateCallWith): Use "auto".
(GenerateConstructorDefinition): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSEventListenercpp">trunk/Source/WebCore/bindings/js/JSEventListener.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSEventListenerh">trunk/Source/WebCore/bindings/js/JSEventListener.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181000 => 181001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-04 16:41:31 UTC (rev 181000)
+++ trunk/Source/WebCore/ChangeLog 2015-03-04 17:30:32 UTC (rev 181001)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2015-03-04 Darin Adler <darin@apple.com>
+
+ Make JavaScript binding get and set legacy event listener attributes directly
+ https://bugs.webkit.org/show_bug.cgi?id=142282
+
+ Reviewed by Sam Weinig.
+
+ Test: fast/dom/legacy-event-handler-attributes.html
+
+ This patch changes the JavaScript getters and setters for these attributes
+ to work directly without requiring any functions in the C++ DOM implementation.
+ A subsequent patch will remove the now-unused C++ DOM implementation.
+
+ * bindings/js/JSEventListener.cpp:
+ (WebCore::legacyEventListenerAttribute): Added.
+ (WebCore::createEventListenerForLegacyAttribute): Added.
+ (WebCore::setLegacyEventListenerAttribute): Added.
+ (WebCore::legacyWindowEventListenerAttribute): Added.
+ (WebCore::setLegacyWindowEventListenerAttribute): Added.
+
+ * bindings/js/JSEventListener.h:
+ (WebCore::createJSEventListenerForAttribute): Deleted.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateAttributeEventListenerCall): Deleted.
+ (LegacyEventListenerAttributeEventName): Added.
+ (LegacyEventListenerAttributePrefix): Added.
+ (GenerateImplementation): Use "auto" in lots of places to simplify the code
+ generation. Replaced the old inlined code to deal with legacy event listener
+ attributes with code that simply calls the new functions from JSEventLister.h.
+ (GenerateCallWith): Use "auto".
+ (GenerateConstructorDefinition): Ditto.
+
</ins><span class="cx"> 2015-03-03 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Split parsing and compiling of content extensions into their own files
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSEventListenercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSEventListener.cpp (181000 => 181001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSEventListener.cpp 2015-03-04 16:41:31 UTC (rev 181000)
+++ trunk/Source/WebCore/bindings/js/JSEventListener.cpp 2015-03-04 17:30:32 UTC (rev 181001)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> #include "BeforeUnloadEvent.h"
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "Frame.h"
</span><ins>+#include "HTMLElement.h"
</ins><span class="cx"> #include "JSEvent.h"
</span><span class="cx"> #include "JSEventTarget.h"
</span><span class="cx"> #include "JSMainThreadExecState.h"
</span><span class="lines">@@ -170,4 +171,49 @@
</span><span class="cx"> return JSEventListener::create(&listener, &wrapper, false, currentWorld(&state));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline JSC::JSValue eventHandlerAttribute(EventListener* abstractListener, ScriptExecutionContext& context)
+{
+ if (!abstractListener)
+ return jsNull();
+
+ auto* listener = JSEventListener::cast(abstractListener);
+ if (!listener)
+ return jsNull();
+
+ auto* function = listener->jsFunction(&context);
+ if (!function)
+ return jsNull();
+
+ return function;
+}
+
+static inline RefPtr<JSEventListener> createEventListenerForEventHandlerAttribute(JSC::ExecState& state, JSC::JSValue listener, JSC::JSObject& wrapper)
+{
+ if (!listener.isObject())
+ return nullptr;
+ return JSEventListener::create(asObject(listener), &wrapper, true, currentWorld(&state));
+}
+
+JSC::JSValue eventHandlerAttribute(EventTarget& target, const AtomicString& eventType)
+{
+ return eventHandlerAttribute(target.getAttributeEventListener(eventType), *target.scriptExecutionContext());
+}
+
+void setEventHandlerAttribute(JSC::ExecState& state, JSC::JSObject& wrapper, EventTarget& target, const AtomicString& eventType, JSC::JSValue value)
+{
+ target.setAttributeEventListener(eventType, createEventListenerForEventHandlerAttribute(state, value, wrapper));
+}
+
+JSC::JSValue windowForwardedEventHandlerAttribute(HTMLElement& element, const AtomicString& eventType)
+{
+ auto& document = element.document();
+ return eventHandlerAttribute(document.getWindowAttributeEventListener(eventType), document);
+}
+
+void setWindowForwardedEventHandlerAttribute(JSC::ExecState& state, JSC::JSObject& wrapper, HTMLElement& element, const AtomicString& eventType, JSC::JSValue value)
+{
+ ASSERT(wrapper.globalObject());
+ element.document().setWindowAttributeEventListener(eventType, createEventListenerForEventHandlerAttribute(state, value, *wrapper.globalObject()));
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSEventListenerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSEventListener.h (181000 => 181001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSEventListener.h 2015-03-04 16:41:31 UTC (rev 181000)
+++ trunk/Source/WebCore/bindings/js/JSEventListener.h 2015-03-04 17:30:32 UTC (rev 181001)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+ class EventTarget;
+ class HTMLElement;
</ins><span class="cx"> class JSDOMGlobalObject;
</span><span class="cx">
</span><span class="cx"> class JSEventListener : public EventListener {
</span><span class="lines">@@ -75,9 +77,14 @@
</span><span class="cx"> RefPtr<DOMWrapperWorld> m_isolatedWorld;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- // For "onXXX" event attributes.
- RefPtr<JSEventListener> createJSEventListenerForAttribute(JSC::ExecState&, JSC::JSValue listener, JSC::JSObject& wrapper);
</del><ins>+ // For "onxxx" attributes that automatically set up JavaScript event listeners.
+ JSC::JSValue eventHandlerAttribute(EventTarget&, const AtomicString& eventType);
+ void setEventHandlerAttribute(JSC::ExecState&, JSC::JSObject&, EventTarget&, const AtomicString& eventType, JSC::JSValue);
</ins><span class="cx">
</span><ins>+ // Like the functions above, but for attributes that forward event handlers to the window object rather than setting them on the target.
+ JSC::JSValue windowForwardedEventHandlerAttribute(HTMLElement&, const AtomicString& eventType);
+ void setWindowForwardedEventHandlerAttribute(JSC::ExecState&, JSC::JSObject&, HTMLElement&, const AtomicString& eventType, JSC::JSValue);
+
</ins><span class="cx"> Ref<JSEventListener> createJSEventListenerForAdd(JSC::ExecState&, JSC::JSObject& listener, JSC::JSObject& wrapper);
</span><span class="cx"> Ref<JSEventListener> createJSEventListenerForRemove(JSC::ExecState&, JSC::JSObject& listener, JSC::JSObject& wrapper);
</span><span class="cx">
</span><span class="lines">@@ -112,13 +119,6 @@
</span><span class="cx"> return m_jsFunction.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- inline RefPtr<JSEventListener> createJSEventListenerForAttribute(JSC::ExecState& state, JSC::JSValue listener, JSC::JSObject& wrapper)
- {
- if (!listener.isObject())
- return nullptr;
- return JSEventListener::create(asObject(listener), &wrapper, true, currentWorld(&state));
- }
-
</del><span class="cx"> inline Ref<JSEventListener> createJSEventListenerForRemove(JSC::ExecState& state, JSC::JSObject& listener, JSC::JSObject& wrapper)
</span><span class="cx"> {
</span><span class="cx"> return createJSEventListenerForAdd(state, listener, wrapper);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (181000 => 181001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-03-04 16:41:31 UTC (rev 181000)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-03-04 17:30:32 UTC (rev 181001)
</span><span class="lines">@@ -140,16 +140,21 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub GenerateAttributeEventListenerCall
</del><ins>+sub EventHandlerAttributeEventName
</ins><span class="cx"> {
</span><del>- my $implSetterFunctionName = shift;
- my $windowEventListener = shift;
</del><ins>+ my $attribute = shift;
</ins><span class="cx">
</span><del>- my $wrapperObject = $windowEventListener ? "globalObject" : "castedThis";
- my @GenerateEventListenerImpl = ();
</del><ins>+ # Remove the "on" prefix.
+ my $eventType = substr($attribute->signature->name, 2);
</ins><span class="cx">
</span><del>- push(@GenerateEventListenerImpl, " impl.set$implSetterFunctionName(createJSEventListenerForAttribute(*exec, value, *$wrapperObject));\n");
- return @GenerateEventListenerImpl;
</del><ins>+ # FIXME: Consider adding a property in the IDL file instead of hard coding these four event names.
+ # Note: This same hard coded list of property names exists in HTMLElement.cpp.
+ $eventType = "webkitAnimationEnd" if $eventType eq "webkitanimationend";
+ $eventType = "webkitAnimationIteration" if $eventType eq "webkitanimationiteration";
+ $eventType = "webkitAnimationStart" if $eventType eq "webkitanimationstart";
+ $eventType = "webkitTransitionEnd" if $eventType eq "webkittransitionend";
+
+ return "eventNames().${eventType}Event";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GenerateEventListenerCall
</span><span class="lines">@@ -1969,7 +1974,7 @@
</span><span class="cx"> push(@implContent, "{\n");
</span><span class="cx"> push(@implContent, " VM& vm = exec->vm();\n");
</span><span class="cx"> push(@implContent, " UNUSED_PARAM(vm);\n");
</span><del>- push(@implContent, " ${className}Prototype* thisObject = jsCast<${className}Prototype*>(object);\n");
</del><ins>+ push(@implContent, " auto* thisObject = jsCast<${className}Prototype*>(object);\n");
</ins><span class="cx">
</span><span class="cx"> if ($numConstants eq 0 && $numFunctions eq 0 && $numPrototypeAttributes eq 0) {
</span><span class="cx"> push(@implContent, " return Base::getOwnPropertySlot(thisObject, exec, propertyName, slot);\n");
</span><span class="lines">@@ -2012,7 +2017,7 @@
</span><span class="cx"> if ($interface->extendedAttributes->{"JSCustomNamedGetterOnPrototype"}) {
</span><span class="cx"> push(@implContent, "void ${className}Prototype::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)\n");
</span><span class="cx"> push(@implContent, "{\n");
</span><del>- push(@implContent, " ${className}Prototype* thisObject = jsCast<${className}Prototype*>(cell);\n");
</del><ins>+ push(@implContent, " auto* thisObject = jsCast<${className}Prototype*>(cell);\n");
</ins><span class="cx"> push(@implContent, " if (thisObject->putDelegate(exec, propertyName, value, slot))\n");
</span><span class="cx"> push(@implContent, " return;\n");
</span><span class="cx"> push(@implContent, " Base::put(thisObject, exec, propertyName, value, slot);\n");
</span><span class="lines">@@ -2106,7 +2111,7 @@
</span><span class="cx"> if (!$interface->extendedAttributes->{"CustomGetOwnPropertySlot"}) {
</span><span class="cx"> push(@implContent, "bool ${className}::getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot& slot)\n");
</span><span class="cx"> push(@implContent, "{\n");
</span><del>- push(@implContent, " ${className}* thisObject = jsCast<${className}*>(object);\n");
</del><ins>+ push(@implContent, " auto* thisObject = jsCast<${className}*>(object);\n");
</ins><span class="cx"> push(@implContent, " ASSERT_GC_OBJECT_INHERITS(thisObject, info());\n");
</span><span class="cx"> push(@implContent, GenerateGetOwnPropertySlotBody($interface, $interfaceName, $className, $numInstanceAttributes > 0, 0));
</span><span class="cx"> push(@implContent, "}\n\n");
</span><span class="lines">@@ -2117,7 +2122,7 @@
</span><span class="cx"> || $interface->extendedAttributes->{"JSCustomGetOwnPropertySlotAndDescriptor"}) {
</span><span class="cx"> push(@implContent, "bool ${className}::getOwnPropertySlotByIndex(JSObject* object, ExecState* exec, unsigned index, PropertySlot& slot)\n");
</span><span class="cx"> push(@implContent, "{\n");
</span><del>- push(@implContent, " ${className}* thisObject = jsCast<${className}*>(object);\n");
</del><ins>+ push(@implContent, " auto* thisObject = jsCast<${className}*>(object);\n");
</ins><span class="cx"> push(@implContent, " ASSERT_GC_OBJECT_INHERITS(thisObject, info());\n");
</span><span class="cx">
</span><span class="cx"> # Sink the int-to-string conversion that happens when we create a PropertyName
</span><span class="lines">@@ -2190,9 +2195,9 @@
</span><span class="cx"> push(@implContent, " UNUSED_PARAM(thisValue);\n");
</span><span class="cx"> if (!$attribute->isStatic || $attribute->signature->type =~ /Constructor$/) {
</span><span class="cx"> if ($interface->extendedAttributes->{"CustomProxyToJSObject"}) {
</span><del>- push(@implContent, " ${className}* castedThis = to${className}(JSValue::decode(thisValue));\n");
</del><ins>+ push(@implContent, " auto* castedThis = to${className}(JSValue::decode(thisValue));\n");
</ins><span class="cx"> } elsif (AttributeShouldBeOnInstance($interface, $attribute)) {
</span><del>- push(@implContent, " ${className}* castedThis = jsCast<JS${interfaceName}*>(slotBase);\n");
</del><ins>+ push(@implContent, " auto* castedThis = jsCast<JS${interfaceName}*>(slotBase);\n");
</ins><span class="cx"> if (InterfaceRequiresAttributesOnInstanceForCompatibility($interface)) {
</span><span class="cx"> push(@implContent, " ${className}* castedThisObject = " . GetCastingHelperForThisObject($interface) . "(JSValue::decode(thisValue));\n");
</span><span class="cx"> push(@implContent, " if (UNLIKELY(!castedThisObject))\n");
</span><span class="lines">@@ -2283,23 +2288,13 @@
</span><span class="cx"> push(@implContent, " return JSValue::encode(castedThis->$implGetterFunctionName(exec));\n");
</span><span class="cx"> } elsif ($attribute->signature->extendedAttributes->{"CheckSecurityForNode"}) {
</span><span class="cx"> $implIncludes{"JSDOMBinding.h"} = 1;
</span><del>- push(@implContent, " $implType& impl = castedThis->impl();\n");
</del><ins>+ push(@implContent, " auto& impl = castedThis->impl();\n");
</ins><span class="cx"> push(@implContent, " return JSValue::encode(shouldAllowAccessToNode(exec, impl." . $attribute->signature->name . "()) ? " . NativeToJSValue($attribute->signature, 0, $interfaceName, "impl.$implGetterFunctionName()", "castedThis") . " : jsNull());\n");
</span><span class="cx"> } elsif ($type eq "EventListener") {
</span><del>- $implIncludes{"EventListener.h"} = 1;
</del><ins>+ my $getter = $attribute->signature->extendedAttributes->{"JSWindowEventListener"} ? "windowForwardedEventHandlerAttribute" : "eventHandlerAttribute";
+ my $eventName = EventHandlerAttributeEventName($attribute);
</ins><span class="cx"> push(@implContent, " UNUSED_PARAM(exec);\n");
</span><del>- push(@implContent, " $implType& impl = castedThis->impl();\n");
- push(@implContent, " if (EventListener* listener = impl.$implGetterFunctionName()) {\n");
- push(@implContent, " if (const JSEventListener* jsListener = JSEventListener::cast(listener)) {\n");
- if ($interfaceName eq "Document" || $codeGenerator->InheritsInterface($interface, "WorkerGlobalScope")) {
- push(@implContent, " if (JSObject* jsFunction = jsListener->jsFunction(&impl))\n");
- } else {
- push(@implContent, " if (JSObject* jsFunction = jsListener->jsFunction(impl.scriptExecutionContext()))\n");
- }
- push(@implContent, " return JSValue::encode(jsFunction);\n");
- push(@implContent, " }\n");
- push(@implContent, " }\n");
- push(@implContent, " return JSValue::encode(jsNull());\n");
</del><ins>+ push(@implContent, " return JSValue::encode($getter(castedThis->impl(), $eventName));\n");
</ins><span class="cx"> } elsif ($attribute->signature->type =~ /Constructor$/) {
</span><span class="cx"> my $constructorType = $attribute->signature->type;
</span><span class="cx"> $constructorType =~ s/Constructor$//;
</span><span class="lines">@@ -2352,7 +2347,7 @@
</span><span class="cx">
</span><span class="cx"> unshift(@arguments, @callWithArgs);
</span><span class="cx"> my $jsType = NativeToJSValue($attribute->signature, 0, $interfaceName, "${functionName}(" . join(", ", @arguments) . ")", "castedThis");
</span><del>- push(@implContent, " $implType& impl = castedThis->impl();\n") if !$attribute->isStatic;
</del><ins>+ push(@implContent, " auto& impl = castedThis->impl();\n") if !$attribute->isStatic;
</ins><span class="cx"> if ($codeGenerator->IsSVGAnimatedType($type)) {
</span><span class="cx"> push(@implContent, " RefPtr<$type> obj = $jsType;\n");
</span><span class="cx"> push(@implContent, " JSValue result = toJS(exec, castedThis->globalObject(), obj.get());\n");
</span><span class="lines">@@ -2381,7 +2376,7 @@
</span><span class="cx"> push(@implContent, " $svgPropertyOrListPropertyType impl(*castedThis->impl());\n");
</span><span class="cx"> push(@implContent, " JSValue result = " . NativeToJSValue($attribute->signature, 0, $interfaceName, "impl.$implGetterFunctionName(" . join(", ", @arguments) . ")", "castedThis") . ";\n");
</span><span class="cx"> } else {
</span><del>- push(@implContent, " $implType& impl = castedThis->impl();\n");
</del><ins>+ push(@implContent, " auto& impl = castedThis->impl();\n");
</ins><span class="cx"> push(@implContent, " JSValue result = " . NativeToJSValue($attribute->signature, 0, $interfaceName, "impl.$implGetterFunctionName(" . join(", ", @arguments) . ")", "castedThis") . ";\n");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2472,7 +2467,7 @@
</span><span class="cx"> if (!$interface->extendedAttributes->{"CustomPutFunction"}) {
</span><span class="cx"> push(@implContent, "void ${className}::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)\n");
</span><span class="cx"> push(@implContent, "{\n");
</span><del>- push(@implContent, " ${className}* thisObject = jsCast<${className}*>(cell);\n");
</del><ins>+ push(@implContent, " auto* thisObject = jsCast<${className}*>(cell);\n");
</ins><span class="cx"> push(@implContent, " ASSERT_GC_OBJECT_INHERITS(thisObject, info());\n");
</span><span class="cx"> if ($interface->extendedAttributes->{"CustomIndexedSetter"}) {
</span><span class="cx"> push(@implContent, " unsigned index = propertyName.asIndex();\n");
</span><span class="lines">@@ -2492,7 +2487,7 @@
</span><span class="cx"> if ($interface->extendedAttributes->{"CustomIndexedSetter"} || $interface->extendedAttributes->{"CustomNamedSetter"}) {
</span><span class="cx"> push(@implContent, "void ${className}::putByIndex(JSCell* cell, ExecState* exec, unsigned index, JSValue value, bool shouldThrow)\n");
</span><span class="cx"> push(@implContent, "{\n");
</span><del>- push(@implContent, " ${className}* thisObject = jsCast<${className}*>(cell);\n");
</del><ins>+ push(@implContent, " auto* thisObject = jsCast<${className}*>(cell);\n");
</ins><span class="cx"> push(@implContent, " ASSERT_GC_OBJECT_INHERITS(thisObject, info());\n");
</span><span class="cx">
</span><span class="cx"> if ($interface->extendedAttributes->{"CustomIndexedSetter"}) {
</span><span class="lines">@@ -2548,7 +2543,7 @@
</span><span class="cx"> push(@implContent, " ${className}* castedThis = to${className}(JSValue::decode(thisValue));\n");
</span><span class="cx"> } elsif (AttributeShouldBeOnInstance($interface, $attribute)) {
</span><span class="cx"> push(@implContent, " UNUSED_PARAM(thisValue);\n");
</span><del>- push(@implContent, " ${className}* castedThis = jsCast<JS${interfaceName}*>(baseObject);\n");
</del><ins>+ push(@implContent, " auto* castedThis = jsCast<JS${interfaceName}*>(baseObject);\n");
</ins><span class="cx"> if (InterfaceRequiresAttributesOnInstanceForCompatibility($interface)) {
</span><span class="cx"> push(@implContent, " ${className}* castedThisObject = " . GetCastingHelperForThisObject($interface) . "(JSValue::decode(thisValue));\n");
</span><span class="cx"> push(@implContent, " if (UNLIKELY(!castedThisObject))\n");
</span><span class="lines">@@ -2580,18 +2575,15 @@
</span><span class="cx"> if (HasCustomSetter($attribute->signature->extendedAttributes)) {
</span><span class="cx"> push(@implContent, " castedThis->set$implSetterFunctionName(exec, value);\n");
</span><span class="cx"> } elsif ($type eq "EventListener") {
</span><del>- $implIncludes{"JSEventListener.h"} = 1;
- push(@implContent, " UNUSED_PARAM(exec);\n");
- my $windowEventListener = $attribute->signature->extendedAttributes->{"JSWindowEventListener"};
- if ($windowEventListener) {
- push(@implContent, " JSDOMGlobalObject* globalObject = castedThis->globalObject();\n");
- }
- push(@implContent, " $implType& impl = castedThis->impl();\n");
</del><ins>+ my $eventName = EventHandlerAttributeEventName($attribute);
+ # FIXME: Find a way to do this special case without hardcoding the class and attribute names here.
</ins><span class="cx"> if ((($interfaceName eq "DOMWindow") or ($interfaceName eq "WorkerGlobalScope")) and $name eq "onerror") {
</span><span class="cx"> $implIncludes{"JSErrorHandler.h"} = 1;
</span><del>- push(@implContent, " impl.set$implSetterFunctionName(createJSErrorHandler(exec, value, castedThis));\n");
</del><ins>+ push(@implContent, " castedThis->impl().setAttributeEventListener($eventName, createJSErrorHandler(exec, value, castedThis));\n");
</ins><span class="cx"> } else {
</span><del>- push(@implContent, GenerateAttributeEventListenerCall($implSetterFunctionName, $windowEventListener));
</del><ins>+ $implIncludes{"JSEventListener.h"} = 1;
+ my $setter = $attribute->signature->extendedAttributes->{"JSWindowEventListener"} ? "setWindowForwardedEventHandlerAttribute" : "setEventHandlerAttribute";
+ push(@implContent, " $setter(*exec, *castedThis, castedThis->impl(), $eventName, value);\n");
</ins><span class="cx"> }
</span><span class="cx"> } elsif ($attribute->signature->type =~ /Constructor$/) {
</span><span class="cx"> my $constructorType = $attribute->signature->type;
</span><span class="lines">@@ -2602,14 +2594,14 @@
</span><span class="cx"> if ($constructorType ne "any" and $constructorType !~ /Named$/) {
</span><span class="cx"> AddToImplIncludes("JS" . $constructorType . ".h", $attribute->signature->extendedAttributes->{"Conditional"});
</span><span class="cx"> }
</span><del>- push(@implContent, " // Shadowing a built-in constructor\n");
</del><ins>+ push(@implContent, " // Shadowing a built-in constructor.\n");
</ins><span class="cx"> push(@implContent, " castedThis->putDirect(exec->vm(), Identifier(exec, \"$name\"), value);\n");
</span><span class="cx"> } elsif ($attribute->signature->extendedAttributes->{"Replaceable"}) {
</span><del>- push(@implContent, " // Shadowing a built-in object\n");
</del><ins>+ push(@implContent, " // Shadowing a built-in object.\n");
</ins><span class="cx"> push(@implContent, " castedThis->putDirect(exec->vm(), Identifier(exec, \"$name\"), value);\n");
</span><span class="cx"> } else {
</span><span class="cx"> if (!$attribute->isStatic) {
</span><del>- push(@implContent, " $implType& impl = castedThis->impl();\n");
</del><ins>+ push(@implContent, " auto& impl = castedThis->impl();\n");
</ins><span class="cx"> }
</span><span class="cx"> push(@implContent, " ExceptionCode ec = 0;\n") if $setterRaisesException;
</span><span class="cx">
</span><span class="lines">@@ -2712,7 +2704,7 @@
</span><span class="cx"> if ($indexedGetterFunction && !$interface->extendedAttributes->{"CustomEnumerateProperty"}) {
</span><span class="cx"> push(@implContent, "void ${className}::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)\n");
</span><span class="cx"> push(@implContent, "{\n");
</span><del>- push(@implContent, " ${className}* thisObject = jsCast<${className}*>(object);\n");
</del><ins>+ push(@implContent, " auto* thisObject = jsCast<${className}*>(object);\n");
</ins><span class="cx"> push(@implContent, " ASSERT_GC_OBJECT_INHERITS(thisObject, info());\n");
</span><span class="cx"> push(@implContent, " for (unsigned i = 0, count = thisObject->impl().length(); i < count; ++i)\n");
</span><span class="cx"> push(@implContent, " propertyNames.add(Identifier::from(exec, i));\n");
</span><span class="lines">@@ -2819,7 +2811,7 @@
</span><span class="cx"> if ($isCustom) {
</span><span class="cx"> push(@implContent, " return JSValue::encode(castedThis->" . $functionImplementationName . "(exec));\n");
</span><span class="cx"> } else {
</span><del>- push(@implContent, " $implType& impl = castedThis->impl();\n");
</del><ins>+ push(@implContent, " auto& impl = castedThis->impl();\n");
</ins><span class="cx"> if ($svgPropertyType) {
</span><span class="cx"> push(@implContent, " if (impl.isReadOnly()) {\n");
</span><span class="cx"> push(@implContent, " setDOMException(exec, NO_MODIFICATION_ALLOWED_ERR);\n");
</span><span class="lines">@@ -2869,7 +2861,7 @@
</span><span class="cx"> if ($needsVisitChildren) {
</span><span class="cx"> push(@implContent, "void ${className}::visitChildren(JSCell* cell, SlotVisitor& visitor)\n");
</span><span class="cx"> push(@implContent, "{\n");
</span><del>- push(@implContent, " ${className}* thisObject = jsCast<${className}*>(cell);\n");
</del><ins>+ push(@implContent, " auto* thisObject = jsCast<${className}*>(cell);\n");
</ins><span class="cx"> push(@implContent, " ASSERT_GC_OBJECT_INHERITS(thisObject, info());\n");
</span><span class="cx"> push(@implContent, " Base::visitChildren(thisObject, visitor);\n");
</span><span class="cx"> if ($interface->extendedAttributes->{"EventTarget"} || $interface->name eq "EventTarget") {
</span><span class="lines">@@ -2913,8 +2905,8 @@
</span><span class="cx"> push(@implContent, "}\n\n");
</span><span class="cx"> push(@implContent, "EncodedJSValue ${className}::nameGetter(ExecState* exec, JSObject* slotBase, EncodedJSValue, PropertyName propertyName)\n");
</span><span class="cx"> push(@implContent, "{\n");
</span><del>- push(@implContent, " ${className}* thisObj = jsCast<$className*>(slotBase);\n");
- push(@implContent, " return JSValue::encode(toJS(exec, thisObj->globalObject(), thisObj->impl().namedItem(propertyNameToAtomicString(propertyName))));\n");
</del><ins>+ push(@implContent, " auto* thisObject = jsCast<$className*>(slotBase);\n");
+ push(@implContent, " return JSValue::encode(toJS(exec, thisObject->globalObject(), thisObject->impl().namedItem(propertyNameToAtomicString(propertyName))));\n");
</ins><span class="cx"> push(@implContent, "}\n\n");
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2944,14 +2936,14 @@
</span><span class="cx"> # check below the isObservable check.
</span><span class="cx"> my $emittedJSCast = 0;
</span><span class="cx"> if ($codeGenerator->InheritsExtendedAttribute($interface, "ActiveDOMObject")) {
</span><del>- push(@implContent, " JS${interfaceName}* js${interfaceName} = jsCast<JS${interfaceName}*>(handle.slot()->asCell());\n");
</del><ins>+ push(@implContent, " auto* js${interfaceName} = jsCast<JS${interfaceName}*>(handle.slot()->asCell());\n");
</ins><span class="cx"> $emittedJSCast = 1;
</span><span class="cx"> push(@implContent, " if (js${interfaceName}->impl().hasPendingActivity())\n");
</span><span class="cx"> push(@implContent, " return true;\n");
</span><span class="cx"> }
</span><span class="cx"> if ($codeGenerator->InheritsExtendedAttribute($interface, "EventTarget")) {
</span><span class="cx"> if (!$emittedJSCast) {
</span><del>- push(@implContent, " JS${interfaceName}* js${interfaceName} = jsCast<JS${interfaceName}*>(handle.slot()->asCell());\n");
</del><ins>+ push(@implContent, " auto* js${interfaceName} = jsCast<JS${interfaceName}*>(handle.slot()->asCell());\n");
</ins><span class="cx"> $emittedJSCast = 1;
</span><span class="cx"> }
</span><span class="cx"> push(@implContent, " if (js${interfaceName}->impl().isFiringEventListeners())\n");
</span><span class="lines">@@ -2959,7 +2951,7 @@
</span><span class="cx"> }
</span><span class="cx"> if ($codeGenerator->InheritsInterface($interface, "Node")) {
</span><span class="cx"> if (!$emittedJSCast) {
</span><del>- push(@implContent, " JS${interfaceName}* js${interfaceName} = jsCast<JS${interfaceName}*>(handle.slot()->asCell());\n");
</del><ins>+ push(@implContent, " auto* js${interfaceName} = jsCast<JS${interfaceName}*>(handle.slot()->asCell());\n");
</ins><span class="cx"> $emittedJSCast = 1;
</span><span class="cx"> }
</span><span class="cx"> push(@implContent, " if (JSNodeOwner::isReachableFromOpaqueRoots(handle, 0, visitor))\n");
</span><span class="lines">@@ -2967,7 +2959,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (GetGenerateIsReachable($interface)) {
</span><span class="cx"> if (!$emittedJSCast) {
</span><del>- push(@implContent, " JS${interfaceName}* js${interfaceName} = jsCast<JS${interfaceName}*>(handle.slot()->asCell());\n");
</del><ins>+ push(@implContent, " auto* js${interfaceName} = jsCast<JS${interfaceName}*>(handle.slot()->asCell());\n");
</ins><span class="cx"> $emittedJSCast = 1;
</span><span class="cx"> }
</span><span class="cx"> push(@implContent, " if (!isObservable(js${interfaceName}))\n");
</span><span class="lines">@@ -3024,8 +3016,8 @@
</span><span class="cx"> $codeGenerator->InheritsExtendedAttribute($interface, "ActiveDOMObject"))) {
</span><span class="cx"> push(@implContent, "void JS${interfaceName}Owner::finalize(JSC::Handle<JSC::Unknown> handle, void* context)\n");
</span><span class="cx"> push(@implContent, "{\n");
</span><del>- push(@implContent, " JS${interfaceName}* js${interfaceName} = jsCast<JS${interfaceName}*>(handle.slot()->asCell());\n");
- push(@implContent, " DOMWrapperWorld& world = *static_cast<DOMWrapperWorld*>(context);\n");
</del><ins>+ push(@implContent, " auto* js${interfaceName} = jsCast<JS${interfaceName}*>(handle.slot()->asCell());\n");
+ push(@implContent, " auto& world = *static_cast<DOMWrapperWorld*>(context);\n");
</ins><span class="cx"> push(@implContent, " uncacheWrapper(world, &js${interfaceName}->impl(), js${interfaceName});\n");
</span><span class="cx"> push(@implContent, " js${interfaceName}->releaseImpl();\n");
</span><span class="cx"> push(@implContent, "}\n\n");
</span><span class="lines">@@ -3132,7 +3124,7 @@
</span><span class="cx"> push(@callWithArgs, "exec");
</span><span class="cx"> }
</span><span class="cx"> if ($codeGenerator->ExtendedAttributeContains($callWith, "ScriptExecutionContext")) {
</span><del>- push(@$outputArray, " ScriptExecutionContext* scriptContext = jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext();\n");
</del><ins>+ push(@$outputArray, " auto* scriptContext = jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext();\n");
</ins><span class="cx"> push(@$outputArray, " if (!scriptContext)\n");
</span><span class="cx"> push(@$outputArray, " return" . ($returnValue ? " " . $returnValue : "") . ";\n");
</span><span class="cx"> push(@callWithArgs, "scriptContext");
</span><span class="lines">@@ -4509,7 +4501,7 @@
</span><span class="cx"> push(@$outputArray, <<END);
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL ${constructorClassName}::construct${className}(ExecState* exec)
</span><span class="cx"> {
</span><del>- ${constructorClassName}* jsConstructor = jsCast<${constructorClassName}*>(exec->callee());
</del><ins>+ auto* jsConstructor = jsCast<${constructorClassName}*>(exec->callee());
</ins><span class="cx">
</span><span class="cx"> ScriptExecutionContext* executionContext = jsConstructor->scriptExecutionContext();
</span><span class="cx"> if (!executionContext)
</span><span class="lines">@@ -4576,7 +4568,7 @@
</span><span class="cx">
</span><span class="cx"> push(@$outputArray, "EncodedJSValue JSC_HOST_CALL ${constructorClassName}::construct${className}${overloadedIndexString}(ExecState* exec)\n");
</span><span class="cx"> push(@$outputArray, "{\n");
</span><del>- push(@$outputArray, " ${constructorClassName}* castedThis = jsCast<${constructorClassName}*>(exec->callee());\n");
</del><ins>+ push(@$outputArray, " auto* castedThis = jsCast<${constructorClassName}*>(exec->callee());\n");
</ins><span class="cx">
</span><span class="cx"> my @constructorArgList;
</span><span class="cx">
</span><span class="lines">@@ -4606,7 +4598,7 @@
</span><span class="cx"> push(@$outputArray, " ScriptExecutionContext* context = castedThis->scriptExecutionContext();\n");
</span><span class="cx"> push(@$outputArray, " if (!context)\n");
</span><span class="cx"> push(@$outputArray, " return throwConstructorDocumentUnavailableError(*exec, \"${interfaceName}\");\n");
</span><del>- push(@$outputArray, " Document& document = downcast<Document>(*context);\n");
</del><ins>+ push(@$outputArray, " auto& document = downcast<Document>(*context);\n");
</ins><span class="cx"> }
</span><span class="cx"> if ($generatingNamedConstructor) {
</span><span class="cx"> push(@constructorArgList, "*castedThis->document()");
</span></span></pre>
</div>
</div>
</body>
</html>