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

Timestamp:

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

Author:

sroret

Message:

merge with webkit revision 35510

Files:

• trunk/WebCore/bindings/js/JSEventCustom.cpp (modified) (2 diffs)

trunk/WebCore/bindings/js/JSEventCustom.cpp

@@ -53 +53 @@
-#include "WheelEvent.h"
-#include "XMLHttpRequestProgressEvent.h"
-#include <kjs/JSLock.h>
-
-#if ENABLE(DOM_STORAGE)
@@ -76 +75 @@
-JSValue* toJS(ExecState* exec, Event* event)
-{
-    JSLock lock(false);
-
-    if (!event)
-        return jsNull();