Changeset 42235 in webkit


Ignore:
Timestamp:
Apr 5, 2009 3:48:05 PM (15 years ago)
Author:
ggaren@apple.com
Message:

2009-04-05 Geoffrey Garen <​ggaren@apple.com>

[Originally] Reviewed by Sam Weinig.

Rolled back in r42214 with crashes fixed.

[Removed irrelevant ExecState* parameter from event handler registration code.]


[No change in behavior.]

  • bindings/js/JSDOMApplicationCacheCustom.cpp: (WebCore::JSDOMApplicationCache::addEventListener): (WebCore::JSDOMApplicationCache::removeEventListener):
  • bindings/js/JSDOMGlobalObject.cpp: (WebCore::JSDOMGlobalObject::findOrCreateJSProtectedEventListener): (WebCore::JSDOMGlobalObject::findJSEventListener): (WebCore::JSDOMGlobalObject::findOrCreateJSEventListener):
  • bindings/js/JSDOMGlobalObject.h:
  • bindings/js/JSDOMWindowCustom.cpp: (WebCore::JSDOMWindow::addEventListener):
  • bindings/js/JSMessagePortCustom.cpp: (WebCore::JSMessagePort::addEventListener): (WebCore::JSMessagePort::removeEventListener):
  • bindings/js/JSNodeCustom.cpp: (WebCore::JSNode::addEventListener):
  • bindings/js/JSSVGElementInstanceCustom.cpp: (WebCore::JSSVGElementInstance::addEventListener):
  • bindings/js/JSWorkerContextCustom.cpp: (WebCore::JSWorkerContext::addEventListener): (WebCore::JSWorkerContext::removeEventListener):
  • bindings/js/JSWorkerCustom.cpp: (WebCore::JSWorker::addEventListener): (WebCore::JSWorker::removeEventListener):
  • bindings/js/JSXMLHttpRequestCustom.cpp: (WebCore::JSXMLHttpRequest::addEventListener): (WebCore::JSXMLHttpRequest::removeEventListener):
  • bindings/js/JSXMLHttpRequestUploadCustom.cpp: (WebCore::JSXMLHttpRequestUpload::addEventListener): (WebCore::JSXMLHttpRequestUpload::removeEventListener):
  • bindings/scripts/CodeGeneratorJS.pm:
Location:
trunk/WebCore
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r42234 r42235  
     12009-04-05  Geoffrey Garen  <ggaren@apple.com>
     2
     3        [Originally] Reviewed by Sam Weinig.
     4
     5        Rolled back in r42214 with crashes fixed.
     6
     7        [Removed irrelevant ExecState* parameter from event handler registration code.]
     8       
     9        [No change in behavior.]
     10
     11        * bindings/js/JSDOMApplicationCacheCustom.cpp:
     12        (WebCore::JSDOMApplicationCache::addEventListener):
     13        (WebCore::JSDOMApplicationCache::removeEventListener):
     14        * bindings/js/JSDOMGlobalObject.cpp:
     15        (WebCore::JSDOMGlobalObject::findOrCreateJSProtectedEventListener):
     16        (WebCore::JSDOMGlobalObject::findJSEventListener):
     17        (WebCore::JSDOMGlobalObject::findOrCreateJSEventListener):
     18        * bindings/js/JSDOMGlobalObject.h:
     19        * bindings/js/JSDOMWindowCustom.cpp:
     20        (WebCore::JSDOMWindow::addEventListener):
     21        * bindings/js/JSMessagePortCustom.cpp:
     22        (WebCore::JSMessagePort::addEventListener):
     23        (WebCore::JSMessagePort::removeEventListener):
     24        * bindings/js/JSNodeCustom.cpp:
     25        (WebCore::JSNode::addEventListener):
     26        * bindings/js/JSSVGElementInstanceCustom.cpp:
     27        (WebCore::JSSVGElementInstance::addEventListener):
     28        * bindings/js/JSWorkerContextCustom.cpp:
     29        (WebCore::JSWorkerContext::addEventListener):
     30        (WebCore::JSWorkerContext::removeEventListener):
     31        * bindings/js/JSWorkerCustom.cpp:
     32        (WebCore::JSWorker::addEventListener):
     33        (WebCore::JSWorker::removeEventListener):
     34        * bindings/js/JSXMLHttpRequestCustom.cpp:
     35        (WebCore::JSXMLHttpRequest::addEventListener):
     36        (WebCore::JSXMLHttpRequest::removeEventListener):
     37        * bindings/js/JSXMLHttpRequestUploadCustom.cpp:
     38        (WebCore::JSXMLHttpRequestUpload::addEventListener):
     39        (WebCore::JSXMLHttpRequestUpload::removeEventListener):
     40        * bindings/scripts/CodeGeneratorJS.pm:
     41
    1422009-04-05  Erik L. Bunce  <elbunce@xendom.com>
    243

  • trunk/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp

    r42217 r42235  
    113113    if (!globalObject)
    114114        return jsUndefined();
    115     RefPtr<JSEventListener> listener = globalObject->findOrCreateJSEventListener(exec, args.at(exec, 1));
     115    RefPtr<JSEventListener> listener = globalObject->findOrCreateJSEventListener(args.at(exec, 1));
    116116    if (!listener)
    117117        return jsUndefined();
    … …  
    125125    if (!globalObject)
    126126        return jsUndefined();
    127     JSEventListener* listener = globalObject->findJSEventListener(exec, args.at(exec, 1));
     127    JSEventListener* listener = globalObject->findJSEventListener(args.at(exec, 1));
    128128    if (!listener)
    129129        return jsUndefined();

  • trunk/WebCore/bindings/js/JSDOMGlobalObject.cpp

    r42217 r42235  
    9696}
    9797
    98 PassRefPtr<JSProtectedEventListener> JSDOMGlobalObject::findOrCreateJSProtectedEventListener(ExecState*, JSValuePtr val, bool isInline)
     98PassRefPtr<JSProtectedEventListener> JSDOMGlobalObject::findOrCreateJSProtectedEventListener(JSValuePtr val, bool isInline)
    9999{
    100100    if (JSProtectedEventListener* listener = findJSProtectedEventListener(val, isInline))
    … …  
    108108}
    109109
    110 JSEventListener* JSDOMGlobalObject::findJSEventListener(ExecState*, JSValuePtr val, bool isInline)
     110JSEventListener* JSDOMGlobalObject::findJSEventListener(JSValuePtr val, bool isInline)
    111111{
    112112    if (!val.isObject())
    … …  
    117117}
    118118
    119 PassRefPtr<JSEventListener> JSDOMGlobalObject::findOrCreateJSEventListener(ExecState* exec, JSValuePtr val, bool isInline)
     119PassRefPtr<JSEventListener> JSDOMGlobalObject::findOrCreateJSEventListener(JSValuePtr val, bool isInline)
    120120{
    121     if (JSEventListener* listener = findJSEventListener(exec, val, isInline))
     121    if (JSEventListener* listener = findJSEventListener(val, isInline))
    122122        return listener;
    123123

  • trunk/WebCore/bindings/js/JSDOMGlobalObject.h

    r42217 r42235  
    5858
    5959        // Finds or creates a wrapper of a JS EventListener. JS EventListener object is GC-protected.
    60         PassRefPtr<JSProtectedEventListener> findOrCreateJSProtectedEventListener(JSC::ExecState*, JSC::JSValuePtr, bool isInline = false);
     60        PassRefPtr<JSProtectedEventListener> findOrCreateJSProtectedEventListener(JSC::JSValuePtr, bool isInline = false);
    6161
    6262        // Finds a wrapper of a GC-unprotected JS EventListener, returns 0 if no existing one.
    63         JSEventListener* findJSEventListener(JSC::ExecState*, JSC::JSValuePtr, bool isInline = false);
     63        JSEventListener* findJSEventListener(JSC::JSValuePtr, bool isInline = false);
    6464
    6565        // Finds or creates a wrapper of a JS EventListener. JS EventListener object is *NOT* GC-protected.
    66         PassRefPtr<JSEventListener> findOrCreateJSEventListener(JSC::ExecState*, JSC::JSValuePtr, bool isInline = false);
     66        PassRefPtr<JSEventListener> findOrCreateJSEventListener(JSC::JSValuePtr, bool isInline = false);
    6767
    6868        typedef HashMap<JSC::JSObject*, JSProtectedEventListener*> ProtectedListenersMap;

  • trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp

    r42218 r42235  
    300300        return jsUndefined();
    301301
    302     if (RefPtr<JSProtectedEventListener> listener = findOrCreateJSProtectedEventListener(exec, args.at(exec, 1)))
     302    if (RefPtr<JSProtectedEventListener> listener = findOrCreateJSProtectedEventListener(args.at(exec, 1)))
    303303        frame->document()->addWindowEventListener(AtomicString(args.at(exec, 0).toString(exec)), listener.release(), args.at(exec, 2).toBoolean(exec));
    304304

  • trunk/WebCore/bindings/js/JSMessagePortCustom.cpp

    r42217 r42235  
    7474    if (!globalObject)
    7575        return jsUndefined();
    76     RefPtr<JSEventListener> listener = globalObject->findOrCreateJSEventListener(exec, args.at(exec, 1));
     76    RefPtr<JSEventListener> listener = globalObject->findOrCreateJSEventListener(args.at(exec, 1));
    7777    if (!listener)
    7878        return jsUndefined();
    … …  
    8686    if (!globalObject)
    8787        return jsUndefined();
    88     JSEventListener* listener = globalObject->findJSEventListener(exec, args.at(exec, 1));
     88    JSEventListener* listener = globalObject->findJSEventListener(args.at(exec, 1));
    8989    if (!listener)
    9090        return jsUndefined();

  • trunk/WebCore/bindings/js/JSNodeCustom.cpp

    r42217 r42235  
    114114        return jsUndefined();
    115115
    116     if (RefPtr<JSProtectedEventListener> listener = globalObject->findOrCreateJSProtectedEventListener(exec, args.at(exec, 1)))
     116    if (RefPtr<JSProtectedEventListener> listener = globalObject->findOrCreateJSProtectedEventListener(args.at(exec, 1)))
    117117        impl()->addEventListener(args.at(exec, 0).toString(exec), listener.release(), args.at(exec, 2).toBoolean(exec));
    118118

  • trunk/WebCore/bindings/js/JSSVGElementInstanceCustom.cpp

    r42217 r42235  
    4343        return jsUndefined();
    4444
    45     if (RefPtr<JSProtectedEventListener> listener = globalObject->findOrCreateJSProtectedEventListener(exec, args.at(exec, 1)))
     45    if (RefPtr<JSProtectedEventListener> listener = globalObject->findOrCreateJSProtectedEventListener(args.at(exec, 1)))
    4646        impl()->addEventListener(args.at(exec, 0).toString(exec), listener.release(), args.at(exec, 2).toBoolean(exec));
    4747

  • trunk/WebCore/bindings/js/JSWorkerContextCustom.cpp

    r42217 r42235  
    100100JSValuePtr JSWorkerContext::addEventListener(ExecState* exec, const ArgList& args)
    101101{
    102     RefPtr<JSEventListener> listener = findOrCreateJSEventListener(exec, args.at(exec, 1));
     102    RefPtr<JSEventListener> listener = findOrCreateJSEventListener(args.at(exec, 1));
    103103    if (!listener)
    104104        return jsUndefined();
    … …  
    109109JSValuePtr JSWorkerContext::removeEventListener(ExecState* exec, const ArgList& args)
    110110{
    111     JSEventListener* listener = findJSEventListener(exec, args.at(exec, 1));
     111    JSEventListener* listener = findJSEventListener(args.at(exec, 1));
    112112    if (!listener)
    113113        return jsUndefined();

  • trunk/WebCore/bindings/js/JSWorkerCustom.cpp

    r42217 r42235  
    5959    if (!globalObject)
    6060        return jsUndefined();
    61     RefPtr<JSEventListener> listener = globalObject->findOrCreateJSEventListener(exec, args.at(exec, 1));
     61    RefPtr<JSEventListener> listener = globalObject->findOrCreateJSEventListener(args.at(exec, 1));
    6262    if (!listener)
    6363        return jsUndefined();
    … …  
    7171    if (!globalObject)
    7272        return jsUndefined();
    73     JSEventListener* listener = globalObject->findJSEventListener(exec, args.at(exec, 1));
     73    JSEventListener* listener = globalObject->findJSEventListener(args.at(exec, 1));
    7474    if (!listener)
    7575        return jsUndefined();

  • trunk/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp

    r42217 r42235  
    169169    if (!globalObject)
    170170        return jsUndefined();
    171     RefPtr<JSEventListener> listener = globalObject->findOrCreateJSEventListener(exec, args.at(exec, 1));
     171    RefPtr<JSEventListener> listener = globalObject->findOrCreateJSEventListener(args.at(exec, 1));
    172172    if (!listener)
    173173        return jsUndefined();
    … …  
    181181    if (!globalObject)
    182182        return jsUndefined();
    183     JSEventListener* listener = globalObject->findJSEventListener(exec, args.at(exec, 1));
     183    JSEventListener* listener = globalObject->findJSEventListener(args.at(exec, 1));
    184184    if (!listener)
    185185        return jsUndefined();

  • trunk/WebCore/bindings/js/JSXMLHttpRequestUploadCustom.cpp

    r42217 r42235  
    7272    if (!globalObject)
    7373        return jsUndefined();
    74     RefPtr<JSEventListener> listener = globalObject->findOrCreateJSEventListener(exec, args.at(exec, 1));
     74    RefPtr<JSEventListener> listener = globalObject->findOrCreateJSEventListener(args.at(exec, 1));
    7575    if (!listener)
    7676        return jsUndefined();
    … …  
    8484    if (!globalObject)
    8585        return jsUndefined();
    86     JSEventListener* listener = globalObject->findJSEventListener(exec, args.at(exec, 1));
     86    JSEventListener* listener = globalObject->findJSEventListener(args.at(exec, 1));
    8787    if (!listener)
    8888        return jsUndefined();

  • trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm

    r42218 r42235  
    12401240                        } elsif ($type eq "EventListener") {
    12411241                            $implIncludes{"JSEventListener.h"} = 1;
     1242                            push(@implContent, "    UNUSED_PARAM(exec);\n");
    12421243                            push(@implContent, "    $implClassName* imp = static_cast<$implClassName*>(static_cast<$className*>(thisObject)->impl());\n");
    12431244                            my $listenerType;
    … …  
    12561257                                push(@implContent, "        return;\n");
    12571258                            }
    1258                             push(@implContent, "    imp->set$implSetterFunctionName(globalObject->findOrCreate${listenerType}(exec, value, true));\n");
     1259                            push(@implContent, "    imp->set$implSetterFunctionName(globalObject->findOrCreate${listenerType}(value, true));\n");
    12591260                        } elsif ($attribute->signature->type =~ /Constructor$/) {
    12601261                            my $constructorType = $attribute->signature->type;
Note: See TracChangeset for help on using the changeset viewer.