From 50eea7a05518cae9a523e4be0b0e86bacee8eef7 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Mon, 6 Jun 2011 13:43:08 +0100 Subject: Merge WebKit at r82507: Cherry-pick change r88166 to add INSPECTOR guards to ScriptProfiler See http://trac.webkit.org/changeset/88166 Change-Id: Ifb3277d49c14dd600979c8c21c876ed8bc0e4a62 --- Source/WebCore/bindings/v8/ScriptProfiler.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Source/WebCore/bindings/v8') 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()); return node ? new RetainedDOMInfo(node) : 0; } +#endif // ENABLE(INSPECTOR) void ScriptProfiler::initialize() { +#if ENABLE(INSPECTOR) v8::HeapProfiler::DefineWrapperClass(v8DOMSubtreeClassId, &retainedDOMInfo); +#endif // ENABLE(INSPECTOR) } -- cgit v1.1