Remove WebTouchEvent from TouchEventManager APIs

third_party/WebKit/public/platform/WebInputEvent.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 162 matching lines @@
 
     // WebTouchEvent - raw touch pointers not yet classified into gestures.
     kTouchStart,
     kTouchTypeFirst = kTouchStart,
     kTouchMove,
     kTouchEnd,
     kTouchCancel,
     kTouchScrollStarted,
     kTouchTypeLast = kTouchScrollStarted,
 
+    // WebPointerEvent: work in progress
+    kPointerDown,
+    kPointerTypeFirst = kPointerDown,
+    kPointerUp,
+    kPointerMove,
+    kPointerCancel,
+    kPointerTypeLast = kPointerCancel,
+
     kTypeLast = kTouchTypeLast
   };
 
   // The modifier constants cannot change their values since pepper
   // does a 1-1 mapping of its values; see
   // content/renderer/pepper/event_conversion.cc
   //
   // A Java counterpart will be generated for this enum.
   // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.blink_public.web
   // GENERATED_JAVA_CLASS_NAME_OVERRIDE: WebInputEventModifier
@@ skipping 100 matching lines @@
   // Returns true if the WebInputEvent |type| is a touch event.
   static bool IsTouchEventType(WebInputEvent::Type type) {
     return kTouchTypeFirst <= type && type <= kTouchTypeLast;
   }
 
   // Returns true if the WebInputEvent is a gesture event.
   static bool IsGestureEventType(WebInputEvent::Type type) {
     return kGestureTypeFirst <= type && type <= kGestureTypeLast;
   }
 
+  // Returns true if the WebInputEvent |type| is a pointer event.
+  static bool IsPointerEventType(WebInputEvent::Type type) {
+    return kPointerTypeFirst <= type && type <= kPointerTypeLast;
+  }
+
   bool IsSameEventClass(const WebInputEvent& other) const {
     if (IsMouseEventType(type_))
       return IsMouseEventType(other.type_);
     if (IsGestureEventType(type_))
       return IsGestureEventType(other.type_);
     if (IsTouchEventType(type_))
       return IsTouchEventType(other.type_);
     if (IsKeyboardEventType(type_))
       return IsKeyboardEventType(other.type_);
+    if (IsPointerEventType(type_))
+      return IsPointerEventType(other.type_);
     return type_ == other.type_;
   }
 
   // Returns true if the WebInputEvent |type| is a pinch gesture event.
   static bool IsPinchGestureEventType(WebInputEvent::Type type) {
     return kGesturePinchTypeFirst <= type && type <= kGesturePinchTypeLast;
   }
 
   static const char* GetName(WebInputEvent::Type type) {
 #define CASE_TYPE(t)        \
@@ skipping 27 matching lines @@
       CASE_TYPE(GestureLongPress);
       CASE_TYPE(GestureLongTap);
       CASE_TYPE(GesturePinchBegin);
       CASE_TYPE(GesturePinchEnd);
       CASE_TYPE(GesturePinchUpdate);
       CASE_TYPE(TouchStart);
       CASE_TYPE(TouchMove);
       CASE_TYPE(TouchEnd);
       CASE_TYPE(TouchCancel);
       CASE_TYPE(TouchScrollStarted);
-      default:
-        NOTREACHED();
-        return "";
+      CASE_TYPE(PointerDown);
+      CASE_TYPE(PointerUp);
+      CASE_TYPE(PointerMove);
+      CASE_TYPE(PointerCancel);
     }
 #undef CASE_TYPE
+    NOTREACHED();
+    return "";
   }
 
   float FrameScale() const { return frame_scale_; }
   void SetFrameScale(float scale) { frame_scale_ = scale; }
 
   WebFloatPoint FrameTranslate() const { return frame_translate_; }
   void SetFrameTranslate(WebFloatPoint translate) {
     frame_translate_ = translate;
   }
 
@@ skipping 56 matching lines @@
   unsigned size_;              // The size of this structure, for serialization.
   Type type_;
   int modifiers_;
 };
 
 #pragma pack(pop)
 
 }  // namespace blink
 
 #endif