diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /JavaScriptCore/runtime/JSActivation.cpp | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'JavaScriptCore/runtime/JSActivation.cpp')
| -rw-r--r-- | JavaScriptCore/runtime/JSActivation.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/JavaScriptCore/runtime/JSActivation.cpp b/JavaScriptCore/runtime/JSActivation.cpp index d121518..795ad1f 100644 --- a/JavaScriptCore/runtime/JSActivation.cpp +++ b/JavaScriptCore/runtime/JSActivation.cpp @@ -186,6 +186,11 @@ JSObject* JSActivation::toThisObject(ExecState* exec) const return exec->globalThisValue(); } +JSValue JSActivation::toStrictThisObject(ExecState*) const +{ + return jsNull(); +} + bool JSActivation::isDynamicScope(bool& requiresDynamicChecks) const { requiresDynamicChecks = d()->functionExecutable->usesEval(); |