diff options
| author | Sami Merila <sami.merila@nokia.com> | 2009-12-16 10:21:14 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2009-12-16 10:21:14 (GMT) |
| commit | 989895e84806b88f0b1e0d75ce6dbf6c482357b6 (patch) | |
| tree | 95066131a2356d68479d2a4ad9fe719edf49e2fa /src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp | |
| parent | a43868ca114562502618b4e9c3dd096c65c2e192 (diff) | |
| parent | 6e527912d719b0448b91eba1d6a99b9cbe58170a (diff) | |
| download | Qt-989895e84806b88f0b1e0d75ce6dbf6c482357b6.zip Qt-989895e84806b88f0b1e0d75ce6dbf6c482357b6.tar.gz Qt-989895e84806b88f0b1e0d75ce6dbf6c482357b6.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.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.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()); +} |