Changeset 53430 in webkit

Timestamp:

Jan 18, 2010 2:12:12 PM (14 years ago)

Author:

ggaren@apple.com

Message:

2010-01-18 Geoffrey Garen <​ggaren@apple.com>

Reviewed by Darin Adler.

Removed unnecessary use of scriptExecutionContext() when creating a JS event listener.
​https://bugs.webkit.org/show_bug.cgi?id=33811

This change simplifies a bunch of code, and also reduces
the number of places that use the difficult-to-understand and possibly
crashy-null scriptExecutionContext() idiom.

• bindings/js/JSDOMGlobalObject.cpp:
• bindings/js/JSDOMGlobalObject.h:
• bindings/js/JSEventListener.h: (WebCore::createJSAttributeEventListener):
• bindings/scripts/CodeGeneratorJS.pm:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSDOMGlobalObject.cpp (modified) (1 diff)
• bindings/js/JSDOMGlobalObject.h (modified) (1 diff)
• bindings/js/JSEventListener.h (modified) (1 diff)
• bindings/scripts/CodeGeneratorJS.pm (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-18  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Removed unnecessary use of scriptExecutionContext() when creating a JS event listener.
+        https://bugs.webkit.org/show_bug.cgi?id=33811
+
+        This change simplifies a bunch of code, and also reduces
+        the number of places that use the difficult-to-understand and possibly
+        crashy-null scriptExecutionContext() idiom.
+
+        * bindings/js/JSDOMGlobalObject.cpp:
+        * bindings/js/JSDOMGlobalObject.h:
+        * bindings/js/JSEventListener.h:
+        (WebCore::createJSAttributeEventListener):
+        * bindings/scripts/CodeGeneratorJS.pm:
+
 2010-01-18  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebCore/bindings/js/JSDOMGlobalObject.cpp

@@ -60 +60 @@
     if (d()->m_injectedScript)
         markStack.append(d()->m_injectedScript);
-}
-
-PassRefPtr<JSEventListener> JSDOMGlobalObject::createJSAttributeEventListener(JSValue val)
-{
-    if (!val.isObject())
-        return 0;
-
-    return JSEventListener::create(asObject(val), true, currentWorld(globalExec())).get();
 }
 

trunk/WebCore/bindings/js/JSDOMGlobalObject.h

@@ -54 +54 @@
 
         virtual ScriptExecutionContext* scriptExecutionContext() const = 0;
-
-        // Creates a JS EventListener for an "onXXX" event attribute. These
-        // listeners cannot be removed through the removeEventListener API.
-        PassRefPtr<JSEventListener> createJSAttributeEventListener(JSC::JSValue);
 
         // Make binding code generation easier.

trunk/WebCore/bindings/js/JSEventListener.h

@@ -67 +67 @@
     };
 
+    // Creates a JS EventListener for an "onXXX" event attribute.
+    inline PassRefPtr<JSEventListener> createJSAttributeEventListener(JSC::ExecState* exec, JSC::JSValue listener)
+    {
+        if (!listener.isObject())
+            return 0;
+
+        return JSEventListener::create(asObject(listener), true, currentWorld(exec));
+    }
+
+
 } // namespace WebCore
 

trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -1478 +1478 @@
                             push(@implContent, "    UNUSED_PARAM(exec);\n");
                             push(@implContent, "    $implClassName* imp = static_cast<$implClassName*>(static_cast<$className*>(thisObject)->impl());\n");
-                            if ($dataNode->extendedAttributes->{"ExtendsDOMGlobalObject"}) {
-                                push(@implContent, "    JSDOMGlobalObject* globalObject = static_cast<$className*>(thisObject);\n");
-                            } else {
-                                $implIncludes{"Frame.h"} = 1;
-                                $implIncludes{"JSDOMGlobalObject.h"} = 1;
-                                push(@implContent, "    JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(imp->scriptExecutionContext(), exec);\n");
-                                push(@implContent, "    if (!globalObject)\n");
-                                push(@implContent, "        return;\n");
-                            }
-                            push(@implContent, "    imp->set$implSetterFunctionName(globalObject->createJSAttributeEventListener(value));\n");
+                            push(@implContent, "    imp->set$implSetterFunctionName(createJSAttributeEventListener(exec, value));\n");
                         } elsif ($attribute->signature->type =~ /Constructor$/) {
                             my $constructorType = $attribute->signature->type;