diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-07-15 13:02:14 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-07-20 16:57:23 +0100 |
| commit | 437eb84238c98f59ef5768ee86ee27c160416c4c (patch) | |
| tree | 1057c714581ad9cd61f85532a4063b17ed8219ab /WebCore/bindings | |
| parent | eb80fa67dd0bf1b43b573dd1aca0d998581178a1 (diff) | |
| download | external_webkit-437eb84238c98f59ef5768ee86ee27c160416c4c.zip external_webkit-437eb84238c98f59ef5768ee86ee27c160416c4c.tar.gz external_webkit-437eb84238c98f59ef5768ee86ee27c160416c4c.tar.bz2 | |
Merge WebKit at r63173 : @62542 added inspector stuff, but the non-inspector case doesn't seem to compile
Change-Id: I16ee514aa06762fe8c4df50d6739d394d03b6d1b
Diffstat (limited to 'WebCore/bindings')
| -rw-r--r-- | WebCore/bindings/v8/ScriptCallStack.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/bindings/v8/ScriptCallStack.cpp b/WebCore/bindings/v8/ScriptCallStack.cpp index cdc9662..d62175a 100644 --- a/WebCore/bindings/v8/ScriptCallStack.cpp +++ b/WebCore/bindings/v8/ScriptCallStack.cpp @@ -96,6 +96,7 @@ const ScriptCallFrame& ScriptCallStack::at(unsigned index) const bool ScriptCallStack::stackTrace(int frameLimit, const RefPtr<InspectorArray>& stackTrace) { +#if ENABLE(INSPECTOR) if (!v8::Context::InContext()) return false; v8::Handle<v8::Context> context = v8::Context::GetCurrent(); @@ -119,6 +120,9 @@ bool ScriptCallStack::stackTrace(int frameLimit, const RefPtr<InspectorArray>& s stackTrace->push(frameObject); } return true; +#else + return false; +#endif } } // namespace WebCore |