From 50eea7a05518cae9a523e4be0b0e86bacee8eef7 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
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/Android.v8bindings.mk          | 1 +
 Source/WebCore/bindings/v8/ScriptProfiler.cpp | 4 ++++
 2 files changed, 5 insertions(+)

(limited to 'Source/WebCore')

diff --git a/Source/WebCore/Android.v8bindings.mk b/Source/WebCore/Android.v8bindings.mk
index 99e56f1..fe2b126 100644
--- a/Source/WebCore/Android.v8bindings.mk
+++ b/Source/WebCore/Android.v8bindings.mk
@@ -62,6 +62,7 @@ LOCAL_SRC_FILES += \
 	bindings/v8/ScriptFunctionCall.cpp \
 	bindings/v8/ScriptInstance.cpp \
 	bindings/v8/ScriptObject.cpp \
+	bindings/v8/ScriptProfiler.cpp \
 	bindings/v8/ScriptScope.cpp \
 	bindings/v8/ScriptState.cpp \
 	bindings/v8/ScriptValue.cpp \
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)
 }
 
 
-- 
cgit v1.1