Remove PlatformTouchEvent/Point and use WebTouchEvent/Point instead

third_party/WebKit/Source/core/events/PointerEventFactoryTest.cpp

 // Copyright 2015 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.
 
 #include "core/events/PointerEventFactory.h"
 
 #include "core/frame/FrameView.h"
 #include "core/page/Page.h"
 #include "public/platform/WebPointerProperties.h"
 #include <climits>
@@ skipping 26 matching lines @@
   void SetUp() override;
   PointerEvent* createAndCheckTouchCancel(WebPointerProperties::PointerType,
                                           int rawId,
                                           int uniqueId,
                                           bool isPrimary);
   PointerEvent* createAndCheckTouchEvent(
       WebPointerProperties::PointerType,
       int rawId,
       int uniqueId,
       bool isPrimary,
-      PlatformTouchPoint::TouchState = PlatformTouchPoint::TouchPressed,
+      WebTouchPoint::State = WebTouchPoint::StatePressed,
       size_t coalescedEventCount = 0);
   PointerEvent* createAndCheckMouseEvent(
       WebPointerProperties::PointerType,
       int rawId,
       int uniqueId,
       bool isPrimary,
       PlatformEvent::Modifiers = PlatformEvent::NoModifiers,
       size_t coalescedEventCount = 0);
   void createAndCheckPointerTransitionEvent(PointerEvent*, const AtomicString&);
 
   PointerEventFactory m_pointerEventFactory;
   unsigned m_expectedMouseId;
   unsigned m_mappedIdStart;
 
-  class PlatformTouchPointBuilder : public PlatformTouchPoint {
+  class WebTouchPointBuilder : public WebTouchPoint {
    public:
-    PlatformTouchPointBuilder(WebPointerProperties::PointerType,
-                              int,
-                              PlatformTouchPoint::TouchState);
+    WebTouchPointBuilder(WebPointerProperties::PointerType,
+                         int,
+                         WebTouchPoint::State);
   };
 
   class PlatformMouseEventBuilder : public PlatformMouseEvent {
    public:
     PlatformMouseEventBuilder(WebPointerProperties::PointerType,
                               int,
                               PlatformEvent::Modifiers);
   };
 };
 
 void PointerEventFactoryTest::SetUp() {
   m_expectedMouseId = 1;
   m_mappedIdStart = 2;
 }
 
-PointerEventFactoryTest::PlatformTouchPointBuilder::PlatformTouchPointBuilder(
-    WebPointerProperties::PointerType pointerType,
-    int id,
-    PlatformTouchPoint::TouchState state) {
-  m_pointerProperties.id = id;
-  m_pointerProperties.pointerType = pointerType;
-  m_pointerProperties.force = 1.0;
-  m_state = state;
+PointerEventFactoryTest::WebTouchPointBuilder::WebTouchPointBuilder(
+    WebPointerProperties::PointerType pointerTypeParam,
+    int idParam,
+    WebTouchPoint::State stateParam) {
+  id = idParam;
+  pointerType = pointerTypeParam;
+  force = 1.0;
+  state = stateParam;
 }
 
 PointerEventFactoryTest::PlatformMouseEventBuilder::PlatformMouseEventBuilder(
     WebPointerProperties::PointerType pointerType,
     int id,
     PlatformEvent::Modifiers modifiers) {
   m_pointerProperties.pointerType = pointerType;
   m_pointerProperties.id = id;
   m_modifiers = modifiers;
 }
@@ skipping 22 matching lines @@
   EXPECT_EQ(clonePointerEvent->pointerId(), pointerEvent->pointerId());
   EXPECT_EQ(clonePointerEvent->isPrimary(), pointerEvent->isPrimary());
   EXPECT_EQ(clonePointerEvent->type(), type);
 }
 
 PointerEvent* PointerEventFactoryTest::createAndCheckTouchEvent(
     WebPointerProperties::PointerType pointerType,
     int rawId,
     int uniqueId,
     bool isPrimary,
-    PlatformTouchPoint::TouchState state,
+    WebTouchPoint::State state,
     size_t coalescedEventCount) {
-  Vector<PlatformTouchPoint> coalescedEvents;
+  Vector<WebTouchPoint> coalescedEvents;
   for (size_t i = 0; i < coalescedEventCount; i++) {
-    coalescedEvents.push_back(
-        PointerEventFactoryTest::PlatformTouchPointBuilder(pointerType, rawId,
-                                                           state));
+    coalescedEvents.push_back(PointerEventFactoryTest::WebTouchPointBuilder(
+        pointerType, rawId, state));
   }
   PointerEvent* pointerEvent = m_pointerEventFactory.create(
-      PointerEventFactoryTest::PlatformTouchPointBuilder(pointerType, rawId,
-                                                         state),
-      coalescedEvents, PlatformEvent::NoModifiers, nullptr, nullptr);
+      PointerEventFactoryTest::WebTouchPointBuilder(pointerType, rawId, state),
+      coalescedEvents, WebInputEvent::NoModifiers, nullptr, nullptr);
   EXPECT_EQ(uniqueId, pointerEvent->pointerId());
   EXPECT_EQ(isPrimary, pointerEvent->isPrimary());
   const char* expectedPointerType =
       pointerTypeNameForWebPointPointerType(pointerType);
   EXPECT_EQ(expectedPointerType, pointerEvent->pointerType());
   EXPECT_EQ(coalescedEventCount, pointerEvent->getCoalescedEvents().size());
   for (size_t i = 0; i < coalescedEventCount; i++) {
     EXPECT_EQ(uniqueId, pointerEvent->getCoalescedEvents()[i]->pointerId());
     EXPECT_EQ(isPrimary, pointerEvent->getCoalescedEvents()[i]->isPrimary());
     EXPECT_EQ(expectedPointerType, pointerEvent->pointerType());
@@ skipping 130 matching lines @@
 
   PointerEvent* pointerEvent1 = createAndCheckTouchEvent(
       WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
   PointerEvent* pointerEvent2 = createAndCheckTouchEvent(
       WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
 
   EXPECT_TRUE(m_pointerEventFactory.isActive(m_mappedIdStart));
   EXPECT_TRUE(m_pointerEventFactory.isActiveButtonsState(m_mappedIdStart));
 
   createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0,
-                           m_mappedIdStart, true,
-                           PlatformTouchPoint::TouchReleased);
+                           m_mappedIdStart, true, WebTouchPoint::StateReleased);
 
   EXPECT_TRUE(m_pointerEventFactory.isActive(m_mappedIdStart));
   EXPECT_FALSE(m_pointerEventFactory.isActiveButtonsState(m_mappedIdStart));
 
   m_pointerEventFactory.remove(pointerEvent1->pointerId());
   m_pointerEventFactory.remove(pointerEvent2->pointerId());
 
   EXPECT_FALSE(m_pointerEventFactory.isActive(m_mappedIdStart));
   EXPECT_FALSE(m_pointerEventFactory.isActiveButtonsState(m_mappedIdStart));
 
@@ skipping 138 matching lines @@
   }
   createAndCheckTouchCancel(WebPointerProperties::PointerType::Mouse, 0,
                             m_expectedMouseId, true);
 }
 
 TEST_F(PointerEventFactoryTest, CoalescedEvents) {
   createAndCheckMouseEvent(WebPointerProperties::PointerType::Mouse, 0,
                            m_expectedMouseId, true, PlatformEvent::NoModifiers,
                            4);
   createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0,
-                           m_mappedIdStart, true,
-                           PlatformTouchPoint::TouchMoved, 3);
+                           m_mappedIdStart, true, WebTouchPoint::StateMoved, 3);
 }
 
 }  // namespace blink