Webkit roll: 49213:49221

webkit/api/src/PlatformMessagePortChannel.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 20 matching lines @@
 #include "config.h"
 #include "PlatformMessagePortChannel.h"
 
 #include "WebKit.h"
 #include "WebKitClient.h"
 #include "WebMessagePortChannel.h"
 #include "WebString.h"
 
 #include "MessagePort.h"
 #include "ScriptExecutionContext.h"
+#include "SerializedScriptValue.h"
 
 using namespace WebKit;
 
 namespace WebCore {
 
 PassOwnPtr<MessagePortChannel> MessagePortChannel::create(PassRefPtr<PlatformMessagePortChannel> channel)
 {
     return new MessagePortChannel(channel);
 }
 
@@ skipping 120 matching lines @@
 {
     MutexLocker lock(m_mutex);
     m_localPort = 0;
 }
 
 void PlatformMessagePortChannel::postMessageToRemote(PassOwnPtr<MessagePortChannel::EventData> message)
 {
     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()) {
         webChannels = new WebMessagePortChannelArray(channels->size());
         for (size_t i = 0; i < channels->size(); ++i) {
             WebCore::PlatformMessagePortChannel* platformChannel = (*channels)[i]->channel();
             (*webChannels)[i] = platformChannel->webChannelRelease();
             (*webChannels)[i]->setClient(0);
         }
     }
@@ skipping 11 matching lines @@
     if (rv) {
         OwnPtr<MessagePortChannelArray> channels;
         if (webChannels.size()) {
             channels = new MessagePortChannelArray(webChannels.size());
             for (size_t i = 0; i < webChannels.size(); ++i) {
                 RefPtr<PlatformMessagePortChannel> platformChannel = create(webChannels[i]);
                 webChannels[i]->setClient(platformChannel.get());
                 (*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;
 }
 
 void PlatformMessagePortChannel::close()
 {
     MutexLocker lock(m_mutex);
     // Disentangle ourselves from the other end.  We still maintain a reference to m_webChannel,
     // since previously-existing messages should still be delivered.
@@ skipping 23 matching lines @@
 }
 
 WebMessagePortChannel* PlatformMessagePortChannel::webChannelRelease()
 {
     WebMessagePortChannel* rv = m_webChannel;
     m_webChannel = 0;
     return rv;
 }
 
 } // namespace WebCore