Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(333)

Side by Side Diff: content/common/input/input_param_traits.cc

Issue 25385002: Remove the BufferedInputRouter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "content/common/input/input_param_traits.h" 5 #include "content/common/input/input_param_traits.h"
6 6
7 #include "content/common/content_param_traits.h" 7 #include "content/common/content_param_traits.h"
8 #include "content/common/input/input_event_disposition.h"
9 #include "content/common/input/ipc_input_event_payload.h" 8 #include "content/common/input/ipc_input_event_payload.h"
10 #include "content/common/input/web_input_event_payload.h" 9 #include "content/common/input/web_input_event_payload.h"
11 #include "content/common/input_messages.h" 10 #include "content/common/input_messages.h"
12 11
13 namespace IPC { 12 namespace IPC {
14 namespace { 13 namespace {
15 template <typename PayloadType> 14 template <typename PayloadType>
16 scoped_ptr<content::InputEvent::Payload> ReadPayload(const Message* m, 15 scoped_ptr<content::InputEvent::Payload> ReadPayload(const Message* m,
17 PickleIterator* iter) { 16 PickleIterator* iter) {
18 scoped_ptr<PayloadType> event = PayloadType::Create(); 17 scoped_ptr<PayloadType> event = PayloadType::Create();
19 if (!ReadParam(m, iter, event.get())) 18 if (!ReadParam(m, iter, event.get()))
20 return scoped_ptr<content::InputEvent::Payload>(); 19 return scoped_ptr<content::InputEvent::Payload>();
21 return event.template PassAs<content::InputEvent::Payload>(); 20 return event.template PassAs<content::InputEvent::Payload>();
22 } 21 }
23 } // namespace 22 } // namespace
24 23
25 void ParamTraits<content::EventPacket>::Write(Message* m, const param_type& p) {
26 WriteParam(m, p.id());
27 WriteParam(m, p.events());
28 }
29
30 bool ParamTraits<content::EventPacket>::Read(const Message* m,
31 PickleIterator* iter,
32 param_type* p) {
33 int64 id;
34 content::EventPacket::InputEvents events;
35 if (!ReadParam(m, iter, &id) ||
36 !ReadParam(m, iter, &events))
37 return false;
38
39 p->set_id(id);
40 bool events_added_successfully = true;
41 for (size_t i = 0; i < events.size(); ++i) {
42 // Take ownership of all events.
43 scoped_ptr<content::InputEvent> event(events[i]);
44 if (!events_added_successfully)
45 continue;
46 if (!p->Add(event.Pass()))
47 events_added_successfully = false;
48 }
49 events.weak_clear();
50 return events_added_successfully;
51 }
52
53 void ParamTraits<content::EventPacket>::Log(const param_type& p,
54 std::string* l) {
55 l->append("EventPacket((");
56 LogParam(p.id(), l);
57 l->append("), Events(");
58 LogParam(p.events(), l);
59 l->append("))");
60 }
61 24
piman 2013/09/30 23:46:21 nit: remove blank line.
jdduke (slow) 2013/09/30 23:56:12 Done.
62 void ParamTraits<content::InputEvent>::Write(Message* m, const param_type& p) { 25 void ParamTraits<content::InputEvent>::Write(Message* m, const param_type& p) {
63 WriteParam(m, p.id()); 26 WriteParam(m, p.id());
64 WriteParam(m, !!p.payload()); 27 WriteParam(m, !!p.payload());
65 if (!p.valid()) 28 if (!p.valid())
66 return; 29 return;
67 30
68 content::InputEvent::Payload::Type payload_type = p.payload()->GetType(); 31 content::InputEvent::Payload::Type payload_type = p.payload()->GetType();
69 WriteParam(m, payload_type); 32 WriteParam(m, payload_type);
70 switch (payload_type) { 33 switch (payload_type) {
71 case content::InputEvent::Payload::IPC_MESSAGE: 34 case content::InputEvent::Payload::IPC_MESSAGE:
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 l->append("WebInputEventPayload("); 128 l->append("WebInputEventPayload(");
166 LogParam(p.web_event(), l); 129 LogParam(p.web_event(), l);
167 l->append(", "); 130 l->append(", ");
168 LogParam(p.latency_info(), l); 131 LogParam(p.latency_info(), l);
169 l->append(", "); 132 l->append(", ");
170 LogParam(p.is_keyboard_shortcut(), l); 133 LogParam(p.is_keyboard_shortcut(), l);
171 l->append(")"); 134 l->append(")");
172 } 135 }
173 136
174 } // namespace IPC 137 } // namespace IPC
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698