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

Side by Side Diff: ui/events/gestures/gesture_recognizer_impl.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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
« no previous file with comments | « ui/events/gestures/gesture_recognizer_impl.h ('k') | ui/events/gestures/motion_event_aura.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "ui/events/gestures/gesture_recognizer_impl.h" 5 #include "ui/events/gestures/gesture_recognizer_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <limits> 9 #include <limits>
10 #include <memory>
10 11
11 #include "base/command_line.h" 12 #include "base/command_line.h"
12 #include "base/logging.h" 13 #include "base/logging.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "base/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
15 #include "base/time/time.h" 15 #include "base/time/time.h"
16 #include "ui/events/event.h" 16 #include "ui/events/event.h"
17 #include "ui/events/event_constants.h" 17 #include "ui/events/event_constants.h"
18 #include "ui/events/event_switches.h" 18 #include "ui/events/event_switches.h"
19 #include "ui/events/event_utils.h" 19 #include "ui/events/event_utils.h"
20 #include "ui/events/gesture_detection/gesture_configuration.h" 20 #include "ui/events/gesture_detection/gesture_configuration.h"
21 #include "ui/events/gestures/gesture_types.h" 21 #include "ui/events/gestures/gesture_types.h"
22 22
23 namespace ui { 23 namespace ui {
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 156
157 bool GestureRecognizerImpl::CancelActiveTouches(GestureConsumer* consumer) { 157 bool GestureRecognizerImpl::CancelActiveTouches(GestureConsumer* consumer) {
158 bool cancelled_touch = false; 158 bool cancelled_touch = false;
159 if (consumer_gesture_provider_.count(consumer) == 0) 159 if (consumer_gesture_provider_.count(consumer) == 0)
160 return false; 160 return false;
161 const MotionEventAura& pointer_state = 161 const MotionEventAura& pointer_state =
162 consumer_gesture_provider_[consumer]->pointer_state(); 162 consumer_gesture_provider_[consumer]->pointer_state();
163 if (pointer_state.GetPointerCount() == 0) 163 if (pointer_state.GetPointerCount() == 0)
164 return false; 164 return false;
165 // pointer_state is modified every time after DispatchCancelTouchEvent. 165 // pointer_state is modified every time after DispatchCancelTouchEvent.
166 scoped_ptr<MotionEvent> pointer_state_clone = pointer_state.Clone(); 166 std::unique_ptr<MotionEvent> pointer_state_clone = pointer_state.Clone();
167 for (size_t i = 0; i < pointer_state_clone->GetPointerCount(); ++i) { 167 for (size_t i = 0; i < pointer_state_clone->GetPointerCount(); ++i) {
168 TouchEvent touch_event(ui::ET_TOUCH_CANCELLED, gfx::Point(), 168 TouchEvent touch_event(ui::ET_TOUCH_CANCELLED, gfx::Point(),
169 ui::EF_IS_SYNTHESIZED, 169 ui::EF_IS_SYNTHESIZED,
170 pointer_state_clone->GetPointerId(i), 170 pointer_state_clone->GetPointerId(i),
171 ui::EventTimeForNow(), 0.0f, 0.0f, 0.0f, 0.0f); 171 ui::EventTimeForNow(), 0.0f, 0.0f, 0.0f, 0.0f);
172 gfx::PointF point(pointer_state_clone->GetX(i), 172 gfx::PointF point(pointer_state_clone->GetX(i),
173 pointer_state_clone->GetY(i)); 173 pointer_state_clone->GetY(i));
174 touch_event.set_location_f(point); 174 touch_event.set_location_f(point);
175 touch_event.set_root_location_f(point); 175 touch_event.set_root_location_f(point);
176 GestureEventHelper* helper = FindDispatchHelperForConsumer(consumer); 176 GestureEventHelper* helper = FindDispatchHelperForConsumer(consumer);
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 std::vector<GestureEventHelper*>::iterator it; 306 std::vector<GestureEventHelper*>::iterator it;
307 for (it = helpers.begin(); it != helpers.end(); ++it) 307 for (it = helpers.begin(); it != helpers.end(); ++it)
308 gesture_recognizer->AddGestureEventHelper(*it); 308 gesture_recognizer->AddGestureEventHelper(*it);
309 309
310 helpers.clear(); 310 helpers.clear();
311 g_gesture_recognizer_instance = 311 g_gesture_recognizer_instance =
312 static_cast<GestureRecognizerImpl*>(gesture_recognizer); 312 static_cast<GestureRecognizerImpl*>(gesture_recognizer);
313 } 313 }
314 314
315 } // namespace ui 315 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/gestures/gesture_recognizer_impl.h ('k') | ui/events/gestures/motion_event_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698