diff options
| author | Ben Murdoch <benm@google.com> | 2010-06-16 13:44:26 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-06-18 12:20:15 +0100 |
| commit | 0915185a5f84521ded7e10197568db45599d6269 (patch) | |
| tree | a5a3bf7172dd98b2bfef667b862a832c91d9b4f6 /WebCore/bindings | |
| parent | 96b4f79818562341f33f07fad9a6b152c27f02bd (diff) | |
| download | external_webkit-0915185a5f84521ded7e10197568db45599d6269.zip external_webkit-0915185a5f84521ded7e10197568db45599d6269.tar.gz external_webkit-0915185a5f84521ded7e10197568db45599d6269.tar.bz2 | |
Merge webkit.org at r61121: Build fix for break introduced by r57505.
r60568 means we now need to build V8ConsoleCustom.cpp. This should be upstreamed.
See http://trac.webkit.org/changeset/57505 and http://trac.webkit.org/changeset/60568
Upstreaming being tracked in https://bugs.webkit.org/show_bug.cgi?id=40825
Change-Id: I354138014179b405ffb269adc012952e2d9cbb5e
Diffstat (limited to 'WebCore/bindings')
| -rw-r--r-- | WebCore/bindings/v8/custom/V8ConsoleCustom.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/WebCore/bindings/v8/custom/V8ConsoleCustom.cpp b/WebCore/bindings/v8/custom/V8ConsoleCustom.cpp index 7d1cfc1..62838a0 100644 --- a/WebCore/bindings/v8/custom/V8ConsoleCustom.cpp +++ b/WebCore/bindings/v8/custom/V8ConsoleCustom.cpp @@ -44,6 +44,7 @@ namespace WebCore { typedef Vector<RefPtr<ScriptProfile> > ProfilesArray; +#if ENABLE(JAVASCRIPT_DEBUGGER) v8::Handle<v8::Value> V8Console::profilesAccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info) { INC_STATS("DOM.Console.profilesAccessorGetter"); @@ -56,6 +57,7 @@ v8::Handle<v8::Value> V8Console::profilesAccessorGetter(v8::Local<v8::String> na result->Set(v8::Integer::New(index++), toV8(iter->get())); return result; } +#endif v8::Handle<v8::Value> V8Console::memoryAccessorGetter(v8::Local<v8::String>, const v8::AccessorInfo&) { |