Webkit roll: 49213:49221

webkit/api/src/PlatformMessagePortChannel.cpp

Index: webkit/api/src/PlatformMessagePortChannel.cpp
===================================================================
--- webkit/api/src/PlatformMessagePortChannel.cpp	(revision 28228)
+++ webkit/api/src/PlatformMessagePortChannel.cpp	(working copy)
@@ -38,6 +38,7 @@
 
 #include "MessagePort.h"
 #include "ScriptExecutionContext.h"
+#include "SerializedScriptValue.h"
 
 using namespace WebKit;
 
@@ -178,7 +179,7 @@
     if (!m_localPort || !m_webChannel)
         return;
 
-    WebString messageString = message->message();
+    WebString messageString = message->message()->toString();
     OwnPtr<WebCore::MessagePortChannelArray> channels = message->channels();
     WebMessagePortChannelArray* webChannels = NULL;
     if (channels.get() && channels->size()) {
@@ -210,7 +211,8 @@
                 (*channels)[i] = MessagePortChannel::create(platformChannel);
             }
         }
-        result = MessagePortChannel::EventData::create(message, channels.release());
+        RefPtr<SerializedScriptValue> serializedMessage = SerializedScriptValue::create(message);
+        result = MessagePortChannel::EventData::create(serializedMessage.release(), channels.release());
     }
 
     return rv;