Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

1 files changed, 4 insertions, 3 deletions

diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp
index a41ac7879..3d42f814f 100644
--- a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp
+++ b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp
@@ -94,11 +94,12 @@ void JSCustomSQLTransactionCallback::handleEvent(SQLTransaction* transaction, bo
 
     if (!m_data->frame()->script()->isEnabled())
         return;
-        
+
+    // FIXME: This is likely the wrong globalObject (for prototype chains at least)
     JSGlobalObject* globalObject = m_data->frame()->script()->globalObject();
     ExecState* exec = globalObject->globalExec();
         
-    JSC::JSLock lock(false);
+    JSC::JSLock lock(SilenceAssertionsOnly);
         
     JSValue handleEventFunction = m_data->callback()->get(exec, Identifier(exec, "handleEvent"));
     CallData handleEventCallData;
@@ -117,7 +118,7 @@ void JSCustomSQLTransactionCallback::handleEvent(SQLTransaction* transaction, bo
     RefPtr<JSCustomSQLTransactionCallback> protect(this);
         
     MarkedArgumentBuffer args;
-    args.append(toJS(exec, transaction));
+    args.append(toJS(exec, deprecatedGlobalObjectForPrototype(exec), transaction));
 
     globalObject->globalData()->timeoutChecker.start();
     if (handleEventCallType != CallTypeNone)