diff options
| author | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2009-09-29 10:49:57 (GMT) |
|---|---|---|
| committer | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2009-09-29 10:49:57 (GMT) |
| commit | cc910f05b560bf561b45e7d726ffd82f3eb28a7b (patch) | |
| tree | 3be96de0b4174cf03a7e4a45d96866d7c2f0d7b7 /src/3rdparty/webkit/JavaScriptCore/interpreter/CallFrame.h | |
| parent | 9a7ca912ce72476bda57f2306b38e5f6e928fbf5 (diff) | |
| parent | 8fe49324d8b58eb1c0945259da00905cca02822c (diff) | |
| download | Qt-cc910f05b560bf561b45e7d726ffd82f3eb28a7b.zip Qt-cc910f05b560bf561b45e7d726ffd82f3eb28a7b.tar.gz Qt-cc910f05b560bf561b45e7d726ffd82f3eb28a7b.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/interpreter/CallFrame.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/interpreter/CallFrame.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/interpreter/CallFrame.h b/src/3rdparty/webkit/JavaScriptCore/interpreter/CallFrame.h index 92ec06e..b4d49db 100644 --- a/src/3rdparty/webkit/JavaScriptCore/interpreter/CallFrame.h +++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/CallFrame.h @@ -51,14 +51,14 @@ namespace JSC { // Differs from dynamicGlobalObject() during function calls across web browser frames. JSGlobalObject* lexicalGlobalObject() const { - return scopeChain()->globalObject(); + return scopeChain()->globalObject; } // Differs from lexicalGlobalObject because this will have DOM window shell rather than // the actual DOM window, which can't be "this" for security reasons. JSObject* globalThisValue() const { - return scopeChain()->globalThisObject(); + return scopeChain()->globalThis; } // FIXME: Elsewhere, we use JSGlobalData* rather than JSGlobalData&. |