Changeset 427 for trunk/WebCore/bindings/js/JSEventListener.cpp

Timestamp:

08/01/08 14:47:24 (5 months ago)

Author:

sroret

Message:

merge with webkit revision 35510

Files:

• trunk/WebCore/bindings/js/JSEventListener.cpp (modified) (3 diffs)

trunk/WebCore/bindings/js/JSEventListener.cpp

@@ -34 +34 @@
-#include "ScriptController.h"
-#include <kjs/FunctionConstructor.h>
-#include <kjs/JSLock.h>
-#include <wtf/RefCountedLeakCounter.h>
-
@@ -60 +59 @@
-    if (!script->isEnabled() || script->isPaused())
-        return;
-
-    JSLock lock(false);
-
-    ExecState* exec = window->globalExec();
@@ -257 +254 @@
-        ExecState* exec = window()->globalExec();
-
-        JSLock lock(false);
-        ArgList args;
-