diff options
Diffstat (limited to 'WebCore/bindings/v8/ScriptObject.cpp')
| -rw-r--r-- | WebCore/bindings/v8/ScriptObject.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/WebCore/bindings/v8/ScriptObject.cpp b/WebCore/bindings/v8/ScriptObject.cpp index c64cfe4..b6943bd 100644 --- a/WebCore/bindings/v8/ScriptObject.cpp +++ b/WebCore/bindings/v8/ScriptObject.cpp @@ -120,13 +120,9 @@ bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, const S bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, InspectorBackend* value) { ScriptScope scope(scriptState); -#ifdef MANUAL_MERGE_REQUIRED #if !PLATFORM(ANDROID) - scope.global()->Set(v8::String::New(name), V8Proxy::ToV8Object(V8ClassIndex::INSPECTORCONTROLLER, value)); -#endif -#else // MANUAL_MERGE_REQUIRED scope.global()->Set(v8::String::New(name), V8DOMWrapper::convertToV8Object(V8ClassIndex::INSPECTORBACKEND, value)); -#endif // MANUAL_MERGE_REQUIRED +#endif return scope.success(); } |