Remove abstract Clone and Cancel methods from MotionEvent

ui/events/gestures/motion_event_aura.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
 
 #include "ui/events/gestures/motion_event_aura.h"
 
 #include <cmath>
@@ skipping 155 matching lines @@
   return active_touches_[pointer_index].pressure;
 }
 
 MotionEvent::ToolType MotionEventAura::GetToolType(size_t pointer_index) const {
   // TODO(jdduke): Plumb tool type from the platform, crbug.com/404128.
   DCHECK_LT(pointer_index, pointer_count_);
   return MotionEvent::TOOL_TYPE_UNKNOWN;
 }
 
 int MotionEventAura::GetButtonState() const {
-  NOTIMPLEMENTED();
   return 0;
 }
 
 int MotionEventAura::GetFlags() const {
   return flags_;
 }
 
 base::TimeTicks MotionEventAura::GetEventTime() const {
   return last_touch_time_;
 }
 
-scoped_ptr<MotionEvent> MotionEventAura::Clone() const {
-  return scoped_ptr<MotionEvent>(new MotionEventAura(pointer_count_,
-                                                     last_touch_time_,
-                                                     cached_action_,
-                                                     cached_action_index_,
-                                                     flags_,
-                                                     active_touches_));
-}
-scoped_ptr<MotionEvent> MotionEventAura::Cancel() const {
-  return scoped_ptr<MotionEvent>(new MotionEventAura(
-      pointer_count_, last_touch_time_, ACTION_CANCEL, -1, 0, active_touches_));
-}
-
 void MotionEventAura::CleanupRemovedTouchPoints(const TouchEvent& event) {
   if (event.type() != ET_TOUCH_RELEASED &&
       event.type() != ET_TOUCH_CANCELLED) {
     return;
   }
 
-  int index_to_delete = static_cast<int>(GetIndexFromId(event.touch_id()));
+  DCHECK(pointer_count_);
+  int index_to_delete = GetIndexFromId(event.touch_id());
+  cached_action_index_ = 0;
   pointer_count_--;
   active_touches_[index_to_delete] = active_touches_[pointer_count_];
 }
 
 MotionEventAura::PointData::PointData()
     : x(0),
       y(0),
       raw_x(0),
       raw_y(0),
       touch_id(0),
@@ skipping 24 matching lines @@
 }
 
 void MotionEventAura::UpdateCachedAction(const TouchEvent& touch) {
   DCHECK(pointer_count_);
   switch (touch.type()) {
     case ET_TOUCH_PRESSED:
       if (pointer_count_ == 1) {
         cached_action_ = ACTION_DOWN;
       } else {
         cached_action_ = ACTION_POINTER_DOWN;
-        cached_action_index_ =
-            static_cast<int>(GetIndexFromId(touch.touch_id()));
+        cached_action_index_ = GetIndexFromId(touch.touch_id());
       }
       break;
     case ET_TOUCH_RELEASED:
       if (pointer_count_ == 1) {
         cached_action_ = ACTION_UP;
       } else {
         cached_action_ = ACTION_POINTER_UP;
-        cached_action_index_ =
-            static_cast<int>(GetIndexFromId(touch.touch_id()));
-        DCHECK_LT(cached_action_index_, static_cast<int>(pointer_count_));
+        cached_action_index_ = GetIndexFromId(touch.touch_id());
       }
       break;
     case ET_TOUCH_CANCELLED:
       cached_action_ = ACTION_CANCEL;
       break;
     case ET_TOUCH_MOVED:
       cached_action_ = ACTION_MOVE;
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
-size_t MotionEventAura::GetIndexFromId(int id) const {
-  for (size_t i = 0; i < pointer_count_; ++i) {
-    if (active_touches_[i].touch_id == id)
-      return i;
-  }
-  NOTREACHED();
-  return 0;
+int MotionEventAura::GetIndexFromId(int id) const {
+  int index = FindPointerIndexOfId(id);
+  DCHECK_GE(index, 0);
+  DCHECK_LT(index, static_cast<int>(pointer_count_));
+  return index;
 }
 
 }  // namespace ui