summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-10-23 11:18:42 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-10-23 11:18:42 (GMT)
commit97d28c26ba981332f51ab81024bb8b0224afeb81 (patch)
tree9c03fd067695043b3a061ad192b6f45e2cf6ecba /src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp
parentd48c3129992bf4b962201fa908f37f0e2a61f7c4 (diff)
parent180d9189e8098d98848367f673fff723ddd1d068 (diff)
downloadQt-97d28c26ba981332f51ab81024bb8b0224afeb81.zip
Qt-97d28c26ba981332f51ab81024bb8b0224afeb81.tar.gz
Qt-97d28c26ba981332f51ab81024bb8b0224afeb81.tar.bz2
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp b/src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp
index c358a84..e6626b7 100644
--- a/src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp
+++ b/src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp
@@ -25,6 +25,7 @@
#include "config.h"
#include "JSContextRef.h"
+#include "JSContextRefPrivate.h"
#include "APICast.h"
#include "InitializeThreading.h"
@@ -152,3 +153,12 @@ JSContextGroupRef JSContextGetGroup(JSContextRef ctx)
ExecState* exec = toJS(ctx);
return toRef(&exec->globalData());
}
+
+JSGlobalContextRef JSContextGetGlobalContext(JSContextRef ctx)
+{
+ ExecState* exec = toJS(ctx);
+ exec->globalData().heap.registerThread();
+ JSLock lock(exec);
+
+ return toGlobalRef(exec->lexicalGlobalObject()->globalExec());
+}