| Index: ui/events/gesture_detection/motion_event_generic.cc
|
| diff --git a/ui/events/gesture_detection/motion_event_generic.cc b/ui/events/gesture_detection/motion_event_generic.cc
|
| index 56d383974d1699e657fe603dd7ae36f1ac303b25..35e1e250abf11a6d22140d8da2719180343e976c 100644
|
| --- a/ui/events/gesture_detection/motion_event_generic.cc
|
| +++ b/ui/events/gesture_detection/motion_event_generic.cc
|
| @@ -8,6 +8,7 @@
|
| #include "ui/events/gesture_detection/motion_event_generic.h"
|
|
|
| #include <cmath>
|
| +#include <utility>
|
|
|
| #include "base/logging.h"
|
| #include "ui/events/base_event_utils.h"
|
| @@ -239,7 +240,7 @@ scoped_ptr<MotionEventGeneric> MotionEventGeneric::CancelEvent(
|
| new MotionEventGeneric(event, with_history));
|
| cancel_event->set_action(ACTION_CANCEL);
|
| cancel_event->set_unique_event_id(ui::GetNextTouchEventId());
|
| - return cancel_event.Pass();
|
| + return cancel_event;
|
| }
|
|
|
| size_t MotionEventGeneric::PushPointer(const PointerProperties& pointer) {
|
| @@ -260,7 +261,7 @@ void MotionEventGeneric::PushHistoricalEvent(scoped_ptr<MotionEvent> event) {
|
| DCHECK_EQ(event->GetAction(), GetAction());
|
| DCHECK_LE(event->GetEventTime().ToInternalValue(),
|
| GetEventTime().ToInternalValue());
|
| - historical_events_.push_back(event.Pass());
|
| + historical_events_.push_back(std::move(event));
|
| }
|
|
|
| MotionEventGeneric::MotionEventGeneric()
|
| @@ -299,7 +300,7 @@ MotionEventGeneric::MotionEventGeneric(const MotionEvent& event,
|
| event.GetHistoricalY(i, h),
|
| event.GetHistoricalTouchMajor(i, h)));
|
| }
|
| - PushHistoricalEvent(historical_event.Pass());
|
| + PushHistoricalEvent(std::move(historical_event));
|
| }
|
| }
|
|
|
|
|