diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-06 11:37:15 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-06 11:37:15 (GMT) |
| commit | f577abca43ec341ac4b96d5a9fb6fcfdc7411965 (patch) | |
| tree | 0df451f4de071f2e055cd3850a1513ef9ecab2e0 /src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp | |
| parent | 31f4e677256487e7d167517ffd5dd4bef6bb4dd4 (diff) | |
| parent | 1b7d4d29d970405d5559c5641260ea1f09375b27 (diff) | |
| download | Qt-f577abca43ec341ac4b96d5a9fb6fcfdc7411965.zip Qt-f577abca43ec341ac4b96d5a9fb6fcfdc7411965.tar.gz Qt-f577abca43ec341ac4b96d5a9fb6fcfdc7411965.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp b/src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp index a3bdc69..c358a84 100644 --- a/src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/API/JSContextRef.cpp @@ -70,7 +70,7 @@ JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass) #else { #endif - JSLock lock(true); + JSLock lock(LockForReal); return JSGlobalContextCreateInGroup(toRef(&JSGlobalData::sharedInstance()), globalObjectClass); } #endif // PLATFORM(DARWIN) @@ -82,7 +82,7 @@ JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClass { initializeThreading(); - JSLock lock(true); + JSLock lock(LockForReal); RefPtr<JSGlobalData> globalData = group ? PassRefPtr<JSGlobalData>(toJS(group)) : JSGlobalData::create(); |