diff options
Diffstat (limited to 'WebCore/bindings/js/JSDOMWindowCustom.cpp')
| -rw-r--r-- | WebCore/bindings/js/JSDOMWindowCustom.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/WebCore/bindings/js/JSDOMWindowCustom.cpp b/WebCore/bindings/js/JSDOMWindowCustom.cpp index 562e661..703ad8a 100644 --- a/WebCore/bindings/js/JSDOMWindowCustom.cpp +++ b/WebCore/bindings/js/JSDOMWindowCustom.cpp @@ -268,10 +268,8 @@ JSValuePtr JSDOMWindow::addEventListener(ExecState* exec, const ArgList& args) if (!frame) return jsUndefined(); - if (RefPtr<JSEventListener> listener = findOrCreateJSEventListener(exec, args.at(exec, 1))) { - if (Document* doc = frame->document()) - doc->addWindowEventListener(AtomicString(args.at(exec, 0).toString(exec)), listener.release(), args.at(exec, 2).toBoolean(exec)); - } + if (RefPtr<JSProtectedEventListener> listener = findOrCreateJSProtectedEventListener(exec, args.at(exec, 1))) + frame->document()->addWindowEventListener(AtomicString(args.at(exec, 0).toString(exec)), listener.release(), args.at(exec, 2).toBoolean(exec)); return jsUndefined(); } @@ -282,10 +280,8 @@ JSValuePtr JSDOMWindow::removeEventListener(ExecState* exec, const ArgList& args if (!frame) return jsUndefined(); - if (JSEventListener* listener = findJSEventListener(args.at(exec, 1))) { - if (Document* doc = frame->document()) - doc->removeWindowEventListener(AtomicString(args.at(exec, 0).toString(exec)), listener, args.at(exec, 2).toBoolean(exec)); - } + if (JSProtectedEventListener* listener = findJSProtectedEventListener(args.at(exec, 1))) + frame->document()->removeWindowEventListener(AtomicString(args.at(exec, 0).toString(exec)), listener, args.at(exec, 2).toBoolean(exec)); return jsUndefined(); } |