diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-23 05:13:34 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-23 05:13:34 (GMT) |
| commit | aab648826f0a11a93341f29e88c46902d5f31e4d (patch) | |
| tree | 11d26e0f7353c66a92c7af23a67bf32782f19332 /src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp | |
| parent | 5de213210ef4f14e698c3fd970cf7e6c5b27c72d (diff) | |
| parent | eeb116b56f9555458438dfe235b16488db9b1494 (diff) | |
| download | Qt-aab648826f0a11a93341f29e88c46902d5f31e4d.zip Qt-aab648826f0a11a93341f29e88c46902d5f31e4d.tar.gz Qt-aab648826f0a11a93341f29e88c46902d5f31e4d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp | 10 |
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()); +} |