diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-12 11:09:13 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-12 14:28:37 +0100 |
| commit | 71a0ddc289ee36f3d5cf2841ce769de9217d94e0 (patch) | |
| tree | a5bd2bb6aea40addd94fc33b887d5ad92a7a0bd0 /WebCore/bindings/js | |
| parent | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (diff) | |
| download | external_webkit-71a0ddc289ee36f3d5cf2841ce769de9217d94e0.zip external_webkit-71a0ddc289ee36f3d5cf2841ce769de9217d94e0.tar.gz external_webkit-71a0ddc289ee36f3d5cf2841ce769de9217d94e0.tar.bz2 | |
Merge r47029: Resolve merge conflicts in JavaScriptCore and WebCore/bindings.
Diffstat (limited to 'WebCore/bindings/js')
| -rw-r--r-- | WebCore/bindings/js/ScriptObject.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/WebCore/bindings/js/ScriptObject.cpp b/WebCore/bindings/js/ScriptObject.cpp index c5fa399..ea4363e 100644 --- a/WebCore/bindings/js/ScriptObject.cpp +++ b/WebCore/bindings/js/ScriptObject.cpp @@ -32,14 +32,10 @@ #include "ScriptObject.h" #include "JSDOMBinding.h" -#ifdef MANUAL_MERGE_REQUIRED #if ENABLE(JAVASCRIPT_DEBUGGER) -#include "JSInspectorController.h" -#endif -#else // MANUAL_MERGE_REQUIRED #include "JSInspectorBackend.h" -#endif // MANUAL_MERGE_REQUIRED +#endif #include <runtime/JSLock.h> @@ -131,12 +127,9 @@ bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, const S return handleException(scriptState); } -#ifdef MANUAL_MERGE_REQUIRED #if ENABLE(JAVASCRIPT_DEBUGGER) -bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, InspectorController* value) -#else // MANUAL_MERGE_REQUIRED bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, InspectorBackend* value) -#endif // MANUAL_MERGE_REQUIRED +#endif { JSLock lock(SilenceAssertionsOnly); JSDOMGlobalObject* globalObject = static_cast<JSDOMGlobalObject*>(scriptState->lexicalGlobalObject()); |