diff options
| author | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-09-29 16:09:17 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-09-29 16:09:17 (GMT) |
| commit | 1cbe6b2126a10ad846167d147b4cfbf3c6d9b402 (patch) | |
| tree | 84b9ac33707f194cb34c753f91f9c948e2593510 /src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.cpp | |
| parent | d34bbd852241fcd9ddf50c961b5e234f9de0b5ac (diff) | |
| parent | 17c17adbd706d32723ecedeb207c7e467f9fa8eb (diff) | |
| download | Qt-1cbe6b2126a10ad846167d147b4cfbf3c6d9b402.zip Qt-1cbe6b2126a10ad846167d147b4cfbf3c6d9b402.tar.gz Qt-1cbe6b2126a10ad846167d147b4cfbf3c6d9b402.tar.bz2 | |
Merge branch 'mmfphonon' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into mmfphonon
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.cpp index 8d71ac3..9907a8f 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.cpp @@ -129,7 +129,7 @@ void JSGlobalObject::init(JSObject* thisValue) ASSERT(JSLock::currentThreadIsHoldingLock()); d()->globalData = Heap::heap(this)->globalData(); - d()->globalScopeChain = ScopeChain(this, d()->globalData.get(), thisValue); + d()->globalScopeChain = ScopeChain(this, d()->globalData.get(), this, thisValue); JSGlobalObject::globalExec()->init(0, 0, d()->globalScopeChain.node(), CallFrame::noCaller(), 0, 0, 0); |