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

1 files changed, 3 insertions, 2 deletions

diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp
index 324e2bb6f..2d41bb824 100644
--- a/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp
+++ b/src/3rdparty/webkit/WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp
@@ -54,10 +54,11 @@ void JSCustomSQLTransactionErrorCallback::handleEvent(SQLError* error)
     if (!m_frame->script()->isEnabled())
         return;
 
+    // FIXME: This is likely the wrong globalObject (for prototype chains at least)
     JSGlobalObject* globalObject = m_frame->script()->globalObject();
     ExecState* exec = globalObject->globalExec();
 
-    JSC::JSLock lock(false);
+    JSC::JSLock lock(SilenceAssertionsOnly);
 
     JSValue function = m_callback->get(exec, Identifier(exec, "handleEvent"));
     CallData callData;
@@ -74,7 +75,7 @@ void JSCustomSQLTransactionErrorCallback::handleEvent(SQLError* error)
     RefPtr<JSCustomSQLTransactionErrorCallback> protect(this);
 
     MarkedArgumentBuffer args;
-    args.append(toJS(exec, error));
+    args.append(toJS(exec, deprecatedGlobalObjectForPrototype(exec), error));
 
     globalObject->globalData()->timeoutChecker.start();
     call(exec, function, callType, callData, m_callback, args);