Merge 139854

Source/WebCore/bindings/v8/SerializedScriptValue.cpp

Index: Source/WebCore/bindings/v8/SerializedScriptValue.cpp
===================================================================
--- Source/WebCore/bindings/v8/SerializedScriptValue.cpp	(revision 145017)
+++ Source/WebCore/bindings/v8/SerializedScriptValue.cpp	(working copy)
@@ -2410,8 +2410,13 @@
     m_data = wireData.isolatedCopy();
 }
 
-v8::Handle<v8::Value> SerializedScriptValue::deserialize(MessagePortArray* messagePorts, v8::Isolate* isolate)
+v8::Handle<v8::Value> SerializedScriptValue::deserialize(MessagePortArray* messagePorts)
 {
+    return deserialize(v8::Isolate::GetCurrent(), messagePorts);
+}
+
+v8::Handle<v8::Value> SerializedScriptValue::deserialize(v8::Isolate* isolate, MessagePortArray* messagePorts)
+{
     if (!m_data.impl())
         return v8NullWithCheck(isolate);
     COMPILE_ASSERT(sizeof(BufferValueType) == 2, BufferValueTypeIsTwoBytes);
@@ -2421,12 +2426,12 @@
 }
 
 #if ENABLE(INSPECTOR)
-ScriptValue SerializedScriptValue::deserializeForInspector(ScriptState* scriptState, v8::Isolate* isolate)
+ScriptValue SerializedScriptValue::deserializeForInspector(ScriptState* scriptState)
 {
     v8::HandleScope handleScope;
     v8::Context::Scope contextScope(scriptState->context());
 
-    return ScriptValue(deserialize(0, isolate));
+    return ScriptValue(deserialize(scriptState->isolate()));
 }
 #endif