Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Unified Diff: Source/WebCore/bindings/v8/SerializedScriptValue.cpp

Issue 12560005: Merge 139854 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
« no previous file with comments | « Source/WebCore/bindings/v8/SerializedScriptValue.h ('k') | Source/WebCore/bindings/v8/custom/V8HistoryCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698