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

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

Issue 649533003: C++11 declares a type safe null pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Presubmit errors Created 6 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/synthetic_pinch_gesture_params.h" 8 #include "content/common/input/synthetic_pinch_gesture_params.h"
9 #include "content/common/input/synthetic_smooth_scroll_gesture_params.h" 9 #include "content/common/input/synthetic_smooth_scroll_gesture_params.h"
10 #include "content/common/input/web_input_event_traits.h" 10 #include "content/common/input/web_input_event_traits.h"
(...skipping 19 matching lines...) Expand all
30 bool valid_web_event = !!p; 30 bool valid_web_event = !!p;
31 WriteParam(m, valid_web_event); 31 WriteParam(m, valid_web_event);
32 if (valid_web_event) 32 if (valid_web_event)
33 WriteParam(m, static_cast<WebInputEventPointer>(p.get())); 33 WriteParam(m, static_cast<WebInputEventPointer>(p.get()));
34 } 34 }
35 35
36 bool ParamTraits<content::ScopedWebInputEvent>::Read(const Message* m, 36 bool ParamTraits<content::ScopedWebInputEvent>::Read(const Message* m,
37 PickleIterator* iter, 37 PickleIterator* iter,
38 param_type* p) { 38 param_type* p) {
39 bool valid_web_event = false; 39 bool valid_web_event = false;
40 WebInputEventPointer web_event_pointer = NULL; 40 WebInputEventPointer web_event_pointer = nullptr;
41 if (!ReadParam(m, iter, &valid_web_event) || 41 if (!ReadParam(m, iter, &valid_web_event) ||
42 !valid_web_event || 42 !valid_web_event ||
43 !ReadParam(m, iter, &web_event_pointer) || 43 !ReadParam(m, iter, &web_event_pointer) ||
44 !web_event_pointer) 44 !web_event_pointer)
45 return false; 45 return false;
46 46
47 (*p) = content::WebInputEventTraits::Clone(*web_event_pointer); 47 (*p) = content::WebInputEventTraits::Clone(*web_event_pointer);
48 return true; 48 return true;
49 } 49 }
50 50
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 break; 92 break;
93 case content::SyntheticGestureParams::TAP_GESTURE: 93 case content::SyntheticGestureParams::TAP_GESTURE:
94 gesture_params = 94 gesture_params =
95 ReadGestureParams<content::SyntheticTapGestureParams>(m, iter); 95 ReadGestureParams<content::SyntheticTapGestureParams>(m, iter);
96 break; 96 break;
97 default: 97 default:
98 return false; 98 return false;
99 } 99 }
100 100
101 p->set_gesture_params(gesture_params.Pass()); 101 p->set_gesture_params(gesture_params.Pass());
102 return p->gesture_params() != NULL; 102 return p->gesture_params() != nullptr;
103 } 103 }
104 104
105 void ParamTraits<content::SyntheticGesturePacket>::Log(const param_type& p, 105 void ParamTraits<content::SyntheticGesturePacket>::Log(const param_type& p,
106 std::string* l) { 106 std::string* l) {
107 DCHECK(p.gesture_params()); 107 DCHECK(p.gesture_params());
108 switch (p.gesture_params()->GetGestureType()) { 108 switch (p.gesture_params()->GetGestureType()) {
109 case content::SyntheticGestureParams::SMOOTH_SCROLL_GESTURE: 109 case content::SyntheticGestureParams::SMOOTH_SCROLL_GESTURE:
110 LogParam( 110 LogParam(
111 *content::SyntheticSmoothScrollGestureParams::Cast( 111 *content::SyntheticSmoothScrollGestureParams::Cast(
112 p.gesture_params()), 112 p.gesture_params()),
113 l); 113 l);
114 break; 114 break;
115 case content::SyntheticGestureParams::PINCH_GESTURE: 115 case content::SyntheticGestureParams::PINCH_GESTURE:
116 LogParam( 116 LogParam(
117 *content::SyntheticPinchGestureParams::Cast(p.gesture_params()), 117 *content::SyntheticPinchGestureParams::Cast(p.gesture_params()),
118 l); 118 l);
119 break; 119 break;
120 case content::SyntheticGestureParams::TAP_GESTURE: 120 case content::SyntheticGestureParams::TAP_GESTURE:
121 LogParam( 121 LogParam(
122 *content::SyntheticTapGestureParams::Cast(p.gesture_params()), 122 *content::SyntheticTapGestureParams::Cast(p.gesture_params()),
123 l); 123 l);
124 break; 124 break;
125 } 125 }
126 } 126 }
127 127
128 } // namespace IPC 128 } // namespace IPC
OLDNEW
« no previous file with comments | « content/common/host_shared_bitmap_manager_unittest.cc ('k') | content/common/input/touch_event_stream_validator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698