diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebCore/bindings/v8/custom/V8CustomEventListener.cpp | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebCore/bindings/v8/custom/V8CustomEventListener.cpp')
| -rw-r--r-- | WebCore/bindings/v8/custom/V8CustomEventListener.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/WebCore/bindings/v8/custom/V8CustomEventListener.cpp b/WebCore/bindings/v8/custom/V8CustomEventListener.cpp index bd9e307..305da8d 100644 --- a/WebCore/bindings/v8/custom/V8CustomEventListener.cpp +++ b/WebCore/bindings/v8/custom/V8CustomEventListener.cpp @@ -40,7 +40,7 @@ V8EventListener::V8EventListener(Frame* frame, v8::Local<v8::Object> listener, b { m_listener = v8::Persistent<v8::Object>::New(listener); #ifndef NDEBUG - V8Proxy::RegisterGlobalHandle(EVENT_LISTENER, this, m_listener); + V8GCController::registerGlobalHandle(EVENT_LISTENER, this, m_listener); #endif } @@ -49,7 +49,7 @@ V8EventListener::~V8EventListener() if (m_frame) { V8Proxy* proxy = V8Proxy::retrieve(m_frame); if (proxy) - proxy->RemoveV8EventListener(this); + proxy->eventListeners()->remove(this); } disposeListenerObject(); @@ -83,7 +83,9 @@ v8::Local<v8::Value> V8EventListener::callListenerFunction(v8::Handle<v8::Value> v8::Handle<v8::Value> parameters[1] = { jsEvent }; V8Proxy* proxy = V8Proxy::retrieve(m_frame); - return proxy->CallFunction(handlerFunction, receiver, 1, parameters); + if (!proxy) + return v8::Local<v8::Value>(); + return proxy->callFunction(handlerFunction, receiver, 1, parameters); } } // namespace WebCore |