diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-05-25 07:58:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-25 07:58:57 -0700 |
| commit | af3a41387e228a5fbaec2957e5756497f9107b4a (patch) | |
| tree | 12f68f43faa6b0d8d2c5bec49959c1062f0feeac /JavaScriptCore/runtime/JSStaticScopeObject.cpp | |
| parent | 1e51c8e2be1aabe013c4595352e2e1edc16ae0de (diff) | |
| parent | 6c2af9490927c3c5959b5cb07461b646f8b32f6c (diff) | |
| download | external_webkit-af3a41387e228a5fbaec2957e5756497f9107b4a.zip external_webkit-af3a41387e228a5fbaec2957e5756497f9107b4a.tar.gz external_webkit-af3a41387e228a5fbaec2957e5756497f9107b4a.tar.bz2 | |
Merge "Merge WebKit at r59636: Initial merge by git"
Diffstat (limited to 'JavaScriptCore/runtime/JSStaticScopeObject.cpp')
| -rw-r--r-- | JavaScriptCore/runtime/JSStaticScopeObject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/JavaScriptCore/runtime/JSStaticScopeObject.cpp b/JavaScriptCore/runtime/JSStaticScopeObject.cpp index a877ec6..ad10218 100644 --- a/JavaScriptCore/runtime/JSStaticScopeObject.cpp +++ b/JavaScriptCore/runtime/JSStaticScopeObject.cpp @@ -58,7 +58,7 @@ void JSStaticScopeObject::putWithAttributes(ExecState*, const Identifier& proper ASSERT_NOT_REACHED(); } -bool JSStaticScopeObject::isDynamicScope() const +bool JSStaticScopeObject::isDynamicScope(bool&) const { return false; } |