From 44625352c3a017db5cff07061a039b9936aa3e68 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 11 Nov 2009 15:09:18 -0800 Subject: Use the ENABLE(INSPECTOR) guard instead of ENABLE(JAVASCRIPT_DEBUGGER). Also guard the inspector header. This change needs to be upstreamed. Change-Id: I42d5994dc975206cbb376189613dc23426a4a9a8 --- WebCore/bindings/js/ScriptObject.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'WebCore/bindings/js/ScriptObject.cpp') diff --git a/WebCore/bindings/js/ScriptObject.cpp b/WebCore/bindings/js/ScriptObject.cpp index b69ef2b..f14145e 100644 --- a/WebCore/bindings/js/ScriptObject.cpp +++ b/WebCore/bindings/js/ScriptObject.cpp @@ -33,12 +33,12 @@ #include "JSDOMBinding.h" -#if ENABLE(JAVASCRIPT_DEBUGGER) +#include + +#if ENABLE(INSPECTOR) #include "JSInspectorBackend.h" #endif -#include - using namespace JSC; namespace WebCore { @@ -135,7 +135,6 @@ bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, const S return handleException(scriptState); } -#if ENABLE(JAVASCRIPT_DEBUGGER) #if ENABLE(INSPECTOR) bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, InspectorBackend* value) { @@ -145,7 +144,6 @@ bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, Inspect return handleException(scriptState); } #endif // ENABLE(INSPECTOR) -#endif bool ScriptGlobalObject::get(ScriptState* scriptState, const char* name, ScriptObject& value) { -- cgit v1.1