[Android] Out with the Android GR, in with the new unified C++ GR

content/browser/renderer_host/input/gesture_event_packet.cc

Index: content/browser/renderer_host/input/gesture_event_packet.cc
diff --git a/content/browser/renderer_host/input/gesture_event_packet.cc b/content/browser/renderer_host/input/gesture_event_packet.cc
index 542e719f4d0bfdcb21a819e28e90da73a2d9c52f..6e2eaf2f391bf3884c7d5b7b533cd2f59f4a9fb9 100644
--- a/content/browser/renderer_host/input/gesture_event_packet.cc
+++ b/content/browser/renderer_host/input/gesture_event_packet.cc
@@ -5,6 +5,7 @@
 #include "content/browser/renderer_host/input/gesture_event_packet.h"
 
 #include "base/logging.h"
+#include "ui/events/gesture_detection/motion_event.h"
 
 using blink::WebGestureEvent;
 using blink::WebInputEvent;
@@ -14,30 +15,24 @@ using blink::WebTouchPoint;
 namespace content {
 namespace {
 
-GestureEventPacket::GestureSource ToGestureSource(const WebTouchEvent& event) {
-  if (!event.touchesLength)
-    return GestureEventPacket::INVALID;
-  switch (event.type) {
-    case WebInputEvent::TouchStart:
-      for (size_t i = 0; i < event.touchesLength; i++) {
-        if (event.touches[i].state != WebTouchPoint::StatePressed)
-          return GestureEventPacket::TOUCH_BEGIN;
-      }
+GestureEventPacket::GestureSource
+ToGestureSource(const ui::MotionEvent& event) {

[tdresser, 2014/02/27 15:28:30]

Nice cleanup here.

[jdduke (slow), 2014/02/27 17:40:29]

:)

+  switch (event.GetAction()) {
+    case ui::MotionEvent::ACTION_DOWN:
       return GestureEventPacket::TOUCH_SEQUENCE_BEGIN;
-    case WebInputEvent::TouchMove:
+    case ui::MotionEvent::ACTION_UP:
+      return GestureEventPacket::TOUCH_SEQUENCE_END;
+    case ui::MotionEvent::ACTION_MOVE:
       return GestureEventPacket::TOUCH_MOVE;
-    case WebInputEvent::TouchEnd:
-    case WebInputEvent::TouchCancel:
-      for (size_t i = 0; i < event.touchesLength; i++) {
-        if (event.touches[i].state != WebTouchPoint::StateReleased &&
-            event.touches[i].state != WebTouchPoint::StateCancelled) {
-          return GestureEventPacket::TOUCH_END;
-        }
-      }
+    case ui::MotionEvent::ACTION_CANCEL:
       return GestureEventPacket::TOUCH_SEQUENCE_END;
-    default:
-      return GestureEventPacket::INVALID;
-  }
+    case ui::MotionEvent::ACTION_POINTER_DOWN:
+      return GestureEventPacket::TOUCH_BEGIN;
+    case ui::MotionEvent::ACTION_POINTER_UP:
+      return GestureEventPacket::TOUCH_END;
+  };
+  NOTREACHED() << "Invalid ui::MotionEvent action: " << event.GetAction();
+  return GestureEventPacket::INVALID;
 }
 
 }  // namespace
@@ -74,7 +69,7 @@ void GestureEventPacket::Push(const blink::WebGestureEvent& gesture) {
   gestures_[gesture_count_++] = gesture;
 }
 
-GestureEventPacket GestureEventPacket::FromTouch(const WebTouchEvent& event) {
+GestureEventPacket GestureEventPacket::FromTouch(const ui::MotionEvent& event) {
   return GestureEventPacket(ToGestureSource(event));
 }