| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index 44bacadc7560bdecf8bc389ba02da93ba067e479..e35ea14eddbb77a4098890821cb1ac081da0f15e 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -16,6 +16,7 @@
|
| #include "base/debug/trace_event.h"
|
| #include "base/files/file_path.h"
|
| #include "base/i18n/rtl.h"
|
| +#include "base/json/json_reader.h"
|
| #include "base/json/json_writer.h"
|
| #include "base/lazy_instance.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -2969,6 +2970,22 @@ void RenderViewImpl::OnPostMessageEvent(
|
| base::MessageLoopProxy::current().get());
|
| }
|
|
|
| + WebSerializedScriptValue serialized_script_value;
|
| + if (params.is_data_raw_string) {
|
| + v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
|
| + v8::Local<v8::Context> context = frame->mainWorldScriptContext();
|
| + v8::Context::Scope context_scope(context);
|
| + V8ValueConverterImpl converter;
|
| + converter.SetDateAllowed(true);
|
| + converter.SetRegExpAllowed(true);
|
| + scoped_ptr<base::Value> value(new base::StringValue(params.data));
|
| + v8::Handle<v8::Value> result_value = converter.ToV8Value(value.get(),
|
| + context);
|
| + serialized_script_value = WebSerializedScriptValue::serialize(result_value);
|
| + } else {
|
| + serialized_script_value = WebSerializedScriptValue::fromString(params.data);
|
| + }
|
| +
|
| // Create an event with the message. The final parameter to initMessageEvent
|
| // is the last event ID, which is not used with postMessage.
|
| WebDOMEvent event = frame->document().createEvent("MessageEvent");
|
| @@ -2976,7 +2993,7 @@ void RenderViewImpl::OnPostMessageEvent(
|
| msg_event.initMessageEvent("message",
|
| // |canBubble| and |cancellable| are always false
|
| false, false,
|
| - WebSerializedScriptValue::fromString(params.data),
|
| + serialized_script_value,
|
| params.source_origin, source_frame, "", channels);
|
|
|
| // We must pass in the target_origin to do the security check on this side,
|
|
|