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

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

Issue 1154283003: Change most uses of Pickle to base::Pickle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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/synthetic_pinch_gesture_params.h" 8 #include "content/common/input/synthetic_pinch_gesture_params.h"
9 #include "content/common/input/synthetic_smooth_drag_gesture_params.h" 9 #include "content/common/input/synthetic_smooth_drag_gesture_params.h"
10 #include "content/common/input/synthetic_smooth_scroll_gesture_params.h" 10 #include "content/common/input/synthetic_smooth_scroll_gesture_params.h"
11 #include "content/common/input/web_input_event_traits.h" 11 #include "content/common/input/web_input_event_traits.h"
12 #include "content/common/input_messages.h" 12 #include "content/common/input_messages.h"
13 13
14 namespace IPC { 14 namespace IPC {
15 namespace { 15 namespace {
16 template<typename GestureType> 16 template <typename GestureType>
17 scoped_ptr<content::SyntheticGestureParams> ReadGestureParams( 17 scoped_ptr<content::SyntheticGestureParams> ReadGestureParams(
18 const Message* m, 18 const Message* m,
19 PickleIterator* iter) 19 base::PickleIterator* iter) {
20 {
21 scoped_ptr<GestureType> gesture_params(new GestureType); 20 scoped_ptr<GestureType> gesture_params(new GestureType);
22 if (!ReadParam(m, iter, gesture_params.get())) 21 if (!ReadParam(m, iter, gesture_params.get()))
23 return scoped_ptr<content::SyntheticGestureParams>(); 22 return scoped_ptr<content::SyntheticGestureParams>();
24 23
25 return gesture_params.Pass(); 24 return gesture_params.Pass();
26 } 25 }
27 } // namespace 26 } // namespace
28 27
29 void ParamTraits<content::ScopedWebInputEvent>::Write(Message* m, 28 void ParamTraits<content::ScopedWebInputEvent>::Write(Message* m,
30 const param_type& p) { 29 const param_type& p) {
31 bool valid_web_event = !!p; 30 bool valid_web_event = !!p;
32 WriteParam(m, valid_web_event); 31 WriteParam(m, valid_web_event);
33 if (valid_web_event) 32 if (valid_web_event)
34 WriteParam(m, static_cast<WebInputEventPointer>(p.get())); 33 WriteParam(m, static_cast<WebInputEventPointer>(p.get()));
35 } 34 }
36 35
37 bool ParamTraits<content::ScopedWebInputEvent>::Read(const Message* m, 36 bool ParamTraits<content::ScopedWebInputEvent>::Read(const Message* m,
38 PickleIterator* iter, 37 base::PickleIterator* iter,
39 param_type* p) { 38 param_type* p) {
40 bool valid_web_event = false; 39 bool valid_web_event = false;
41 WebInputEventPointer web_event_pointer = NULL; 40 WebInputEventPointer web_event_pointer = NULL;
42 if (!ReadParam(m, iter, &valid_web_event) || 41 if (!ReadParam(m, iter, &valid_web_event) ||
43 !valid_web_event || 42 !valid_web_event ||
44 !ReadParam(m, iter, &web_event_pointer) || 43 !ReadParam(m, iter, &web_event_pointer) ||
45 !web_event_pointer) 44 !web_event_pointer)
46 return false; 45 return false;
47 46
48 (*p) = content::WebInputEventTraits::Clone(*web_event_pointer); 47 (*p) = content::WebInputEventTraits::Clone(*web_event_pointer);
(...skipping 22 matching lines...) Expand all
71 WriteParam(m, *content::SyntheticPinchGestureParams::Cast( 70 WriteParam(m, *content::SyntheticPinchGestureParams::Cast(
72 p.gesture_params())); 71 p.gesture_params()));
73 break; 72 break;
74 case content::SyntheticGestureParams::TAP_GESTURE: 73 case content::SyntheticGestureParams::TAP_GESTURE:
75 WriteParam(m, *content::SyntheticTapGestureParams::Cast( 74 WriteParam(m, *content::SyntheticTapGestureParams::Cast(
76 p.gesture_params())); 75 p.gesture_params()));
77 break; 76 break;
78 } 77 }
79 } 78 }
80 79
81 bool ParamTraits<content::SyntheticGesturePacket>::Read(const Message* m, 80 bool ParamTraits<content::SyntheticGesturePacket>::Read(
82 PickleIterator* iter, 81 const Message* m,
83 param_type* p) { 82 base::PickleIterator* iter,
83 param_type* p) {
84 content::SyntheticGestureParams::GestureType gesture_type; 84 content::SyntheticGestureParams::GestureType gesture_type;
85 if (!ReadParam(m, iter, &gesture_type)) 85 if (!ReadParam(m, iter, &gesture_type))
86 return false; 86 return false;
87 scoped_ptr<content::SyntheticGestureParams> gesture_params; 87 scoped_ptr<content::SyntheticGestureParams> gesture_params;
88 switch (gesture_type) { 88 switch (gesture_type) {
89 case content::SyntheticGestureParams::SMOOTH_SCROLL_GESTURE: 89 case content::SyntheticGestureParams::SMOOTH_SCROLL_GESTURE:
90 gesture_params = 90 gesture_params =
91 ReadGestureParams<content::SyntheticSmoothScrollGestureParams>(m, 91 ReadGestureParams<content::SyntheticSmoothScrollGestureParams>(m,
92 iter); 92 iter);
93 break; 93 break;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 break; 133 break;
134 case content::SyntheticGestureParams::TAP_GESTURE: 134 case content::SyntheticGestureParams::TAP_GESTURE:
135 LogParam( 135 LogParam(
136 *content::SyntheticTapGestureParams::Cast(p.gesture_params()), 136 *content::SyntheticTapGestureParams::Cast(p.gesture_params()),
137 l); 137 l);
138 break; 138 break;
139 } 139 }
140 } 140 }
141 141
142 } // namespace IPC 142 } // namespace IPC
OLDNEW
« no previous file with comments | « content/common/indexed_db/indexed_db_param_traits.cc ('k') | content/common/input/input_param_traits_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698