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

Timestamp:

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

Author:

sroret

Message:

merge with webkit revision 35510

Files:

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

trunk/WebCore/bindings/js/JSCustomXPathNSResolver.cpp

@@ -38 +38 @@
-#include "JSDOMBinding.h"
-#include "ScriptController.h"
-#include <kjs/JSLock.h>
-
-namespace WebCore {
@@ -76 +75 @@
-    if (!m_frame->script()->isEnabled())
-        return String();
-
-    JSLock lock(false);
-
-    JSGlobalObject* globalObject = m_frame->script()->globalObject();