diff options
Diffstat (limited to 'WebCore/bindings/js/ScriptObject.cpp')
| -rw-r--r-- | WebCore/bindings/js/ScriptObject.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/WebCore/bindings/js/ScriptObject.cpp b/WebCore/bindings/js/ScriptObject.cpp index aaf4163..b69ef2b 100644 --- a/WebCore/bindings/js/ScriptObject.cpp +++ b/WebCore/bindings/js/ScriptObject.cpp @@ -135,11 +135,8 @@ bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, const S return handleException(scriptState); } -<<<<<<< HEAD:WebCore/bindings/js/ScriptObject.cpp #if ENABLE(JAVASCRIPT_DEBUGGER) -======= #if ENABLE(INSPECTOR) ->>>>>>> webkit.org at 49305:WebCore/bindings/js/ScriptObject.cpp bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, InspectorBackend* value) { JSLock lock(SilenceAssertionsOnly); @@ -147,11 +144,8 @@ bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, Inspect globalObject->putDirect(Identifier(scriptState, name), toJS(scriptState, globalObject, value)); return handleException(scriptState); } -<<<<<<< HEAD:WebCore/bindings/js/ScriptObject.cpp -#endif -======= #endif // ENABLE(INSPECTOR) ->>>>>>> webkit.org at 49305:WebCore/bindings/js/ScriptObject.cpp +#endif bool ScriptGlobalObject::get(ScriptState* scriptState, const char* name, ScriptObject& value) { |