Remove ui::TouchEvent -> blink::WebTouchEvent conversion methods.

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 51 matching lines @@
 
 }  // namespace
 
 MotionEventAura::MotionEventAura() {
   set_action_index(-1);
 }
 
 MotionEventAura::~MotionEventAura() {
 }
 
-void MotionEventAura::OnTouch(const TouchEvent& touch) {
+bool MotionEventAura::OnTouch(const TouchEvent& touch) {
+  int index = FindPointerIndexOfId(touch.touch_id());
+  bool pointer_id_is_active = index != -1;
+
+  if (touch.type() == ET_TOUCH_PRESSED && pointer_id_is_active) {
+    // Ignore touch press events if we already believe the pointer is down.
+
+    // TODO(tdresser): this should return false (or NOTREACHED());
+    // however, there is at least one case where we need to allow a
+    // touch press from a currently used touch id. See
+    // crbug.com/446852 for details.
+  } else if (touch.type() != ET_TOUCH_PRESSED && !pointer_id_is_active) {
+    // We could have an active touch stream transfered to us, resulting in touch
+    // move or touch up events without associated touch down events. Ignore
+    // them.
+    return false;
+  }
+
+  if (touch.type() == ET_TOUCH_MOVED && touch.x() == GetX(index) &&
+      touch.y() == GetY(index)) {
+    return false;
+  }
+
   switch (touch.type()) {
     case ET_TOUCH_PRESSED:
       AddTouch(touch);
       break;
     case ET_TOUCH_RELEASED:
     case ET_TOUCH_CANCELLED:
       // Removing these touch points needs to be postponed until after the
       // MotionEvent has been dispatched. This cleanup occurs in
       // CleanupRemovedTouchPoints.
       UpdateTouch(touch);
       break;
     case ET_TOUCH_MOVED:
       UpdateTouch(touch);
       break;
     default:
       NOTREACHED();
-      break;
+      return false;
   }
 
   UpdateCachedAction(touch);
   set_flags(touch.flags());
   set_event_time(touch.time_stamp() + base::TimeTicks());
+  return true;
 }
 
 int MotionEventAura::GetId() const {
   return GetPointerId(0);
 }
 
 void MotionEventAura::CleanupRemovedTouchPoints(const TouchEvent& event) {
   if (event.type() != ET_TOUCH_RELEASED &&
       event.type() != ET_TOUCH_CANCELLED) {
     return;
@@ skipping 55 matching lines @@
 }
 
 int MotionEventAura::GetIndexFromId(int id) const {
   int index = FindPointerIndexOfId(id);
   DCHECK_GE(index, 0);
   DCHECK_LT(index, static_cast<int>(GetPointerCount()));
   return index;
 }
 
 }  // namespace ui