diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2009-10-26 12:10:13 (GMT) |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@nokia.com> | 2009-10-26 12:10:13 (GMT) |
| commit | 2b46eff0e7f7d11cf957b9b180177cc4b368c9aa (patch) | |
| tree | 03e166e8393e1928ec5ed3c79c96fa0accd11460 /src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp | |
| parent | e1f691d84dad17c5ee47c97c31ae743093ad8bc9 (diff) | |
| parent | e2ef97128c006ac2a5c99c67bb54eebaa3b45720 (diff) | |
| download | Qt-2b46eff0e7f7d11cf957b9b180177cc4b368c9aa.zip Qt-2b46eff0e7f7d11cf957b9b180177cc4b368c9aa.tar.gz Qt-2b46eff0e7f7d11cf957b9b180177cc4b368c9aa.tar.bz2 | |
Merge commit 'origin/4.6' into core-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()); +} |