diff options
| author | Steve Block <steveblock@google.com> | 2011-06-06 13:43:08 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 16:12:23 +0100 |
| commit | 50eea7a05518cae9a523e4be0b0e86bacee8eef7 (patch) | |
| tree | 007ceb6e05eaeee88ccc48eaed635db6197d4bb7 /Source/WebCore/bindings/v8 | |
| parent | 6bb74b669eb547680cf7a2938ae392b488bf7c31 (diff) | |
| download | external_webkit-50eea7a05518cae9a523e4be0b0e86bacee8eef7.zip external_webkit-50eea7a05518cae9a523e4be0b0e86bacee8eef7.tar.gz external_webkit-50eea7a05518cae9a523e4be0b0e86bacee8eef7.tar.bz2 | |
Merge WebKit at r82507: Cherry-pick change r88166 to add INSPECTOR guards to ScriptProfiler
See http://trac.webkit.org/changeset/88166
Change-Id: Ifb3277d49c14dd600979c8c21c876ed8bc0e4a62
Diffstat (limited to 'Source/WebCore/bindings/v8')
| -rw-r--r-- | Source/WebCore/bindings/v8/ScriptProfiler.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebCore/bindings/v8/ScriptProfiler.cpp b/Source/WebCore/bindings/v8/ScriptProfiler.cpp index 3fe45a8..21537f4 100644 --- a/Source/WebCore/bindings/v8/ScriptProfiler.cpp +++ b/Source/WebCore/bindings/v8/ScriptProfiler.cpp @@ -40,6 +40,7 @@ namespace WebCore { +#if ENABLE(INSPECTOR) void ScriptProfiler::start(ScriptState* state, const String& title) { v8::HandleScope hs; @@ -108,10 +109,13 @@ static v8::RetainedObjectInfo* retainedDOMInfo(uint16_t classId, v8::Handle<v8:: Node* node = V8Node::toNative(wrapper.As<v8::Object>()); return node ? new RetainedDOMInfo(node) : 0; } +#endif // ENABLE(INSPECTOR) void ScriptProfiler::initialize() { +#if ENABLE(INSPECTOR) v8::HeapProfiler::DefineWrapperClass(v8DOMSubtreeClassId, &retainedDOMInfo); +#endif // ENABLE(INSPECTOR) } |