diff options
| author | Ben Murdoch <benm@google.com> | 2009-11-11 15:09:18 -0800 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-11-11 15:09:18 -0800 |
| commit | 44625352c3a017db5cff07061a039b9936aa3e68 (patch) | |
| tree | 0167e7bd60ed40eace6d38b3d433d68857828695 /WebCore | |
| parent | 2c386559c2b67b9921be326a44676937b61b08f4 (diff) | |
| download | external_webkit-44625352c3a017db5cff07061a039b9936aa3e68.zip external_webkit-44625352c3a017db5cff07061a039b9936aa3e68.tar.gz external_webkit-44625352c3a017db5cff07061a039b9936aa3e68.tar.bz2 | |
Use the ENABLE(INSPECTOR) guard instead of ENABLE(JAVASCRIPT_DEBUGGER). Also guard the inspector header.
This change needs to be upstreamed.
Change-Id: I42d5994dc975206cbb376189613dc23426a4a9a8
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/bindings/js/ScriptObject.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
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 <runtime/JSLock.h> + +#if ENABLE(INSPECTOR) #include "JSInspectorBackend.h" #endif -#include <runtime/JSLock.h> - 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) { |