Remove PlatformTouchEvent/Point and use WebTouchEvent/Point instead

third_party/WebKit/Source/core/events/TouchEvent.h

 /*
  * Copyright 2008, The Android Open Source Project
  * Copyright (C) 2012 Research In Motion Limited. 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 copyright
@@ skipping 14 matching lines @@
  */
 
 #ifndef TouchEvent_h
 #define TouchEvent_h
 
 #include "core/CoreExport.h"
 #include "core/dom/TouchList.h"
 #include "core/events/EventDispatchMediator.h"
 #include "core/events/TouchEventInit.h"
 #include "core/events/UIEventWithKeyState.h"
-#include "public/platform/WebPointerProperties.h"
+#include "public/platform/WebTouchEvent.h"
 
 namespace blink {
 
 class CORE_EXPORT TouchEvent final : public UIEventWithKeyState {
   DEFINE_WRAPPERTYPEINFO();
 
  public:
   ~TouchEvent() override;
 
   // We only initialize sourceCapabilities when we create TouchEvent from
   // EventHandler, null if it is from JavaScript.
   static TouchEvent* create() { return new TouchEvent; }
-  static TouchEvent* create(TouchList* touches,
+  static TouchEvent* create(const WebTouchEvent& event,
+                            TouchList* touches,
                             TouchList* targetTouches,
                             TouchList* changedTouches,
                             const AtomicString& type,
                             AbstractView* view,
-                            PlatformEvent::Modifiers modifiers,
-                            bool cancelable,
-                            bool causesScrollingIfUncanceled,
-                            bool firstTouchMoveOrStart,
-                            TimeTicks platformTimeStamp,
-                            TouchAction currentTouchAction,
-                            WebPointerProperties::PointerType pointerType) {
-    return new TouchEvent(touches, targetTouches, changedTouches, type, view,
-                          modifiers, cancelable, causesScrollingIfUncanceled,
-                          firstTouchMoveOrStart, platformTimeStamp,
-                          currentTouchAction, pointerType);
+                            TouchAction currentTouchAction) {
+    return new TouchEvent(event, touches, targetTouches, changedTouches, type,
+                          view, currentTouchAction);
   }
 
   static TouchEvent* create(const AtomicString& type,
                             const TouchEventInit& initializer) {
     return new TouchEvent(type, initializer);
   }
 
   TouchList* touches() const { return m_touches.get(); }
   TouchList* targetTouches() const { return m_targetTouches.get(); }
   TouchList* changedTouches() const { return m_changedTouches.get(); }
 
   void setTouches(TouchList* touches) { m_touches = touches; }
   void setTargetTouches(TouchList* targetTouches) {
     m_targetTouches = targetTouches;
   }
   void setChangedTouches(TouchList* changedTouches) {
     m_changedTouches = changedTouches;
   }
 
-  bool causesScrollingIfUncanceled() const {
-    return m_causesScrollingIfUncanceled;
-  }
-
   bool isTouchEvent() const override;
 
   const AtomicString& interfaceName() const override;
 
   void preventDefault() override;
 
   void doneDispatchingEventAtCurrentTarget() override;
 
   EventDispatchMediator* createMediator() override;
 
-  // Transient property to inform PPAPI of touch pointer types. Will be replaced
-  // when blink transitions to handling end-to-end pointer events.
-  WebPointerProperties::PointerType pointerType() const {
-    return m_pointerType;
-  }
+  const WebTouchEvent* nativeEvent() const { return m_nativeEvent.get(); }
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
   TouchEvent();
-  TouchEvent(TouchList* touches,
+  TouchEvent(const WebTouchEvent&,
+             TouchList* touches,
              TouchList* targetTouches,
              TouchList* changedTouches,
              const AtomicString& type,
              AbstractView*,
-             PlatformEvent::Modifiers,
-             bool cancelable,
-             bool causesScrollingIfUncanceled,
-             bool firstTouchMoveOrStart,
-             TimeTicks platformTimeStamp,
-             TouchAction currentTouchAction,
-             WebPointerProperties::PointerType);
+             TouchAction currentTouchAction);
   TouchEvent(const AtomicString&, const TouchEventInit&);
+  bool isTouchStartOrFirstTouchMove() const;
 
   Member<TouchList> m_touches;
   Member<TouchList> m_targetTouches;
   Member<TouchList> m_changedTouches;
-  bool m_causesScrollingIfUncanceled;
-  bool m_firstTouchMoveOrStart;
+
   bool m_defaultPreventedBeforeCurrentTarget;
 
   // The current effective touch action computed before each
   // touchstart event is generated. It is used for UMA histograms.
   TouchAction m_currentTouchAction;
 
-  WebPointerProperties::PointerType m_pointerType;
+  std::unique_ptr<WebTouchEvent> m_nativeEvent;
 };
 
 class TouchEventDispatchMediator final : public EventDispatchMediator {
  public:
   static TouchEventDispatchMediator* create(TouchEvent*);
 
  private:
   explicit TouchEventDispatchMediator(TouchEvent*);
   TouchEvent& event() const;
   DispatchEventResult dispatchEvent(EventDispatcher&) const override;
 };
 
 DEFINE_EVENT_TYPE_CASTS(TouchEvent);
 
 }  // namespace blink
 
 #endif  // TouchEvent_h