diff options
| author | John Reck <jreck@google.com> | 2010-11-04 12:00:17 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2010-11-09 11:35:04 -0800 |
| commit | e14391e94c850b8bd03680c23b38978db68687a8 (patch) | |
| tree | 3fed87e6620fecaf3edc7259ae58a11662bedcb2 /JavaScriptCore/interpreter/CallFrame.h | |
| parent | 1bd705833a68f07850cf7e204b26f8d328d16951 (diff) | |
| download | external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.zip external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.gz external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.bz2 | |
Merge Webkit at r70949: Initial merge by git.
Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
Diffstat (limited to 'JavaScriptCore/interpreter/CallFrame.h')
| -rw-r--r-- | JavaScriptCore/interpreter/CallFrame.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/JavaScriptCore/interpreter/CallFrame.h b/JavaScriptCore/interpreter/CallFrame.h index bde9786..56709f3 100644 --- a/JavaScriptCore/interpreter/CallFrame.h +++ b/JavaScriptCore/interpreter/CallFrame.h @@ -63,9 +63,6 @@ namespace JSC { return scopeChain()->globalThis; } - // FIXME: Elsewhere, we use JSGlobalData* rather than JSGlobalData&. - // We should make this more uniform and either use a reference everywhere - // or a pointer everywhere. JSGlobalData& globalData() const { ASSERT(scopeChain()->globalData); @@ -79,7 +76,6 @@ namespace JSC { void clearException() { globalData().exception = JSValue(); } JSValue exception() const { return globalData().exception; } - JSValue* exceptionSlot() { return &globalData().exception; } bool hadException() const { return globalData().exception; } const CommonIdentifiers& propertyNames() const { return *globalData().propertyNames; } |