1 files changed, 23 insertions, 18 deletions

diff --git a/WebCore/bindings/v8/ScriptObject.cpp b/WebCore/bindings/v8/ScriptObject.cpp
index 59316f0..c64cfe4 100644
--- a/WebCore/bindings/v8/ScriptObject.cpp
+++ b/WebCore/bindings/v8/ScriptObject.cpp
@@ -43,8 +43,9 @@
 
 namespace WebCore {
 
-ScriptObject::ScriptObject(v8::Handle<v8::Object> v8Object)
+ScriptObject::ScriptObject(ScriptState* scriptState, v8::Handle<v8::Object> v8Object)
     : ScriptValue(v8Object)
+    , m_scriptState(scriptState)
 {
 }
 
@@ -54,51 +55,51 @@ v8::Local<v8::Object> ScriptObject::v8Object() const
     return v8::Local<v8::Object>(v8::Object::Cast(*v8Value()));
 }
 
-bool ScriptObject::set(ScriptState* scriptState, const String& name, const String& value)
+bool ScriptObject::set(const String& name, const String& value)
 {
-    ScriptScope scope(scriptState);
+    ScriptScope scope(m_scriptState);
     v8Object()->Set(v8String(name), v8String(value));
     return scope.success();
 }
 
-bool ScriptObject::set(ScriptState* scriptState, const char* name, const ScriptObject& value)
+bool ScriptObject::set(const char* name, const ScriptObject& value)
 {
-    ScriptScope scope(scriptState);
+    ScriptScope scope(m_scriptState);
     v8Object()->Set(v8::String::New(name), value.v8Value());
     return scope.success();
 }
 
-bool ScriptObject::set(ScriptState* scriptState, const char* name, const String& value)
+bool ScriptObject::set(const char* name, const String& value)
 {
-    ScriptScope scope(scriptState);
+    ScriptScope scope(m_scriptState);
     v8Object()->Set(v8::String::New(name), v8String(value));
     return scope.success();
 }
 
-bool ScriptObject::set(ScriptState* scriptState, const char* name, double value)
+bool ScriptObject::set(const char* name, double value)
 {
-    ScriptScope scope(scriptState);
+    ScriptScope scope(m_scriptState);
     v8Object()->Set(v8::String::New(name), v8::Number::New(value));
     return scope.success();
 }
 
-bool ScriptObject::set(ScriptState* scriptState, const char* name, long long value)
+bool ScriptObject::set(const char* name, long long value)
 {
-    ScriptScope scope(scriptState);
+    ScriptScope scope(m_scriptState);
     v8Object()->Set(v8::String::New(name), v8::Number::New(value));
     return scope.success();
 }
 
-bool ScriptObject::set(ScriptState* scriptState, const char* name, int value)
+bool ScriptObject::set(const char* name, int value)
 {
-    ScriptScope scope(scriptState);
+    ScriptScope scope(m_scriptState);
     v8Object()->Set(v8::String::New(name), v8::Number::New(value));
     return scope.success();
 }
 
-bool ScriptObject::set(ScriptState* scriptState, const char* name, bool value)
+bool ScriptObject::set(const char* name, bool value)
 {
-    ScriptScope scope(scriptState);
+    ScriptScope scope(m_scriptState);
     v8Object()->Set(v8::String::New(name), v8Boolean(value));
     return scope.success();
 }
@@ -106,7 +107,7 @@ bool ScriptObject::set(ScriptState* scriptState, const char* name, bool value)
 ScriptObject ScriptObject::createNew(ScriptState* scriptState)
 {
     ScriptScope scope(scriptState);
-    return ScriptObject(v8::Object::New());
+    return ScriptObject(scriptState, v8::Object::New());
 }
 
 bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, const ScriptObject& value)
@@ -116,12 +117,16 @@ bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, const S
     return scope.success();
 }
 
-bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, InspectorController* value)
+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
     return scope.success();
 }
 
@@ -135,7 +140,7 @@ bool ScriptGlobalObject::get(ScriptState* scriptState, const char* name, ScriptO
     if (!v8Value->IsObject())
         return false;
 
-    value = ScriptObject(v8::Handle<v8::Object>(v8::Object::Cast(*v8Value)));
+    value = ScriptObject(scriptState, v8::Handle<v8::Object>(v8::Object::Cast(*v8Value)));
     return true;
 }