Optionally have MessagePort pass data as base::Value, part 1.

content/child/webmessageportchannel_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_CHILD_WEBMESSAGEPORTCHANNEL_IMPL_H_
 #define CONTENT_CHILD_WEBMESSAGEPORTCHANNEL_IMPL_H_
 
 #include <queue>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
+#include "content/public/common/message_port_message.h"
 #include "ipc/ipc_listener.h"
 #include "third_party/WebKit/public/platform/WebMessagePortChannel.h"
 
 namespace base {
 class SingleThreadTaskRunner;
+class Value;
 }
 
 namespace content {
 class ChildThread;
 
 // This is thread safe.
 class WebMessagePortChannelImpl
     : public blink::WebMessagePortChannel,
       public IPC::Listener,
       public base::RefCountedThreadSafe<WebMessagePortChannelImpl> {
@@ skipping 31 matching lines @@
   virtual void setClient(blink::WebMessagePortChannelClient* client);
   virtual void destroy();
   virtual void postMessage(const blink::WebString& message,
                            blink::WebMessagePortChannelArray* channels);
   virtual bool tryGetMessage(blink::WebString* message,
                              blink::WebMessagePortChannelArray& channels);
 
   void Init();
   void Entangle(scoped_refptr<WebMessagePortChannelImpl> channel);
   void Send(IPC::Message* message);
-  void PostMessage(const base::string16& message,
+  void PostMessage(const MessagePortMessage& message,
                    blink::WebMessagePortChannelArray* channels);
 
   // IPC::Listener implementation.
   bool OnMessageReceived(const IPC::Message& message) override;
 
-  void OnMessage(const base::string16& message,
+  void OnMessage(const MessagePortMessage& message,
                  const std::vector<int>& sent_message_port_ids,
                  const std::vector<int>& new_routing_ids);
   void OnMessagesQueued();
 
   struct Message {
     Message();
     ~Message();
 
-    base::string16 message;
+    MessagePortMessage message;
     std::vector<WebMessagePortChannelImpl*> ports;
   };
 
   typedef std::queue<Message> MessageQueue;
   MessageQueue message_queue_;
 
   blink::WebMessagePortChannelClient* client_;
   base::Lock lock_;  // Locks access to above.
 
   int route_id_;  // The routing id for this object.
   int message_port_id_;  // A globally unique identifier for this message port.
+  // Flag to indicate if messages should be send to the browser process as

[scheib, 2015/02/18 20:58:55]

s/send/sent/

[Marijn Kruisselbrink, 2015/02/26 23:12:54]

Done.

+  // base::Value instances as opposed to being serialized using the default
+  // blink::WebSerializedScriptValue. Not currently ever set as there are some

[scheib, 2015/02/18 20:58:55]

Cite an issue#

[Marijn Kruisselbrink, 2015/02/26 23:12:54]

Actually I just removed this part of the comment, since the next patch in this
series would make this untrue anyway.

+  // issues to work out with message ports that are transferred.
+  bool send_messages_as_values_;
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMessagePortChannelImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_WEBMESSAGEPORTCHANNEL_IMPL_H_