OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CONTENT_CHILD_WEBMESSAGEPORTCHANNEL_IMPL_H_ | 5 #ifndef CONTENT_CHILD_WEBMESSAGEPORTCHANNEL_IMPL_H_ |
6 #define CONTENT_CHILD_WEBMESSAGEPORTCHANNEL_IMPL_H_ | 6 #define CONTENT_CHILD_WEBMESSAGEPORTCHANNEL_IMPL_H_ |
7 | 7 |
8 #include <queue> | 8 #include <queue> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
12 #include "base/memory/ref_counted.h" | 12 #include "base/memory/ref_counted.h" |
13 #include "base/memory/scoped_ptr.h" | |
13 #include "base/strings/string16.h" | 14 #include "base/strings/string16.h" |
14 #include "base/synchronization/lock.h" | 15 #include "base/synchronization/lock.h" |
16 #include "content/public/common/message_port_message.h" | |
15 #include "ipc/ipc_listener.h" | 17 #include "ipc/ipc_listener.h" |
16 #include "third_party/WebKit/public/platform/WebMessagePortChannel.h" | 18 #include "third_party/WebKit/public/platform/WebMessagePortChannel.h" |
17 | 19 |
18 namespace base { | 20 namespace base { |
19 class SingleThreadTaskRunner; | 21 class SingleThreadTaskRunner; |
22 class Value; | |
20 } | 23 } |
21 | 24 |
22 namespace content { | 25 namespace content { |
23 class ChildThread; | 26 class ChildThread; |
24 | 27 |
25 // This is thread safe. | 28 // This is thread safe. |
26 class WebMessagePortChannelImpl | 29 class WebMessagePortChannelImpl |
27 : public blink::WebMessagePortChannel, | 30 : public blink::WebMessagePortChannel, |
28 public IPC::Listener, | 31 public IPC::Listener, |
29 public base::RefCountedThreadSafe<WebMessagePortChannelImpl> { | 32 public base::RefCountedThreadSafe<WebMessagePortChannelImpl> { |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
61 virtual void setClient(blink::WebMessagePortChannelClient* client); | 64 virtual void setClient(blink::WebMessagePortChannelClient* client); |
62 virtual void destroy(); | 65 virtual void destroy(); |
63 virtual void postMessage(const blink::WebString& message, | 66 virtual void postMessage(const blink::WebString& message, |
64 blink::WebMessagePortChannelArray* channels); | 67 blink::WebMessagePortChannelArray* channels); |
65 virtual bool tryGetMessage(blink::WebString* message, | 68 virtual bool tryGetMessage(blink::WebString* message, |
66 blink::WebMessagePortChannelArray& channels); | 69 blink::WebMessagePortChannelArray& channels); |
67 | 70 |
68 void Init(); | 71 void Init(); |
69 void Entangle(scoped_refptr<WebMessagePortChannelImpl> channel); | 72 void Entangle(scoped_refptr<WebMessagePortChannelImpl> channel); |
70 void Send(IPC::Message* message); | 73 void Send(IPC::Message* message); |
71 void PostMessage(const base::string16& message, | 74 void PostMessage(const MessagePortMessage& message, |
72 blink::WebMessagePortChannelArray* channels); | 75 blink::WebMessagePortChannelArray* channels); |
73 | 76 |
74 // IPC::Listener implementation. | 77 // IPC::Listener implementation. |
75 bool OnMessageReceived(const IPC::Message& message) override; | 78 bool OnMessageReceived(const IPC::Message& message) override; |
76 | 79 |
77 void OnMessage(const base::string16& message, | 80 void OnMessage(const MessagePortMessage& message, |
78 const std::vector<int>& sent_message_port_ids, | 81 const std::vector<int>& sent_message_port_ids, |
79 const std::vector<int>& new_routing_ids); | 82 const std::vector<int>& new_routing_ids); |
80 void OnMessagesQueued(); | 83 void OnMessagesQueued(); |
81 | 84 |
82 struct Message { | 85 struct Message { |
83 Message(); | 86 Message(); |
84 ~Message(); | 87 ~Message(); |
85 | 88 |
86 base::string16 message; | 89 MessagePortMessage message; |
87 std::vector<WebMessagePortChannelImpl*> ports; | 90 std::vector<WebMessagePortChannelImpl*> ports; |
88 }; | 91 }; |
89 | 92 |
90 typedef std::queue<Message> MessageQueue; | 93 typedef std::queue<Message> MessageQueue; |
91 MessageQueue message_queue_; | 94 MessageQueue message_queue_; |
92 | 95 |
93 blink::WebMessagePortChannelClient* client_; | 96 blink::WebMessagePortChannelClient* client_; |
94 base::Lock lock_; // Locks access to above. | 97 base::Lock lock_; // Locks access to above. |
95 | 98 |
96 int route_id_; // The routing id for this object. | 99 int route_id_; // The routing id for this object. |
97 int message_port_id_; // A globally unique identifier for this message port. | 100 int message_port_id_; // A globally unique identifier for this message port. |
101 // 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.
| |
102 // base::Value instances as opposed to being serialized using the default | |
103 // 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,
| |
104 // issues to work out with message ports that are transferred. | |
105 bool send_messages_as_values_; | |
98 scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_; | 106 scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_; |
99 | 107 |
100 DISALLOW_COPY_AND_ASSIGN(WebMessagePortChannelImpl); | 108 DISALLOW_COPY_AND_ASSIGN(WebMessagePortChannelImpl); |
101 }; | 109 }; |
102 | 110 |
103 } // namespace content | 111 } // namespace content |
104 | 112 |
105 #endif // CONTENT_CHILD_WEBMESSAGEPORTCHANNEL_IMPL_H_ | 113 #endif // CONTENT_CHILD_WEBMESSAGEPORTCHANNEL_IMPL_H_ |
OLD | NEW |