Remove WebTouchEvent from TouchEventManager APIs

third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp

 /*
  * Copyright (C) 2012 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 626 matching lines @@
   WebElement plugin_container_one_element =
       web_view->MainFrame()->GetDocument().GetElementById(
           WebString::FromUTF8("scrolled-plugin"));
   plugin_container_one_element.PluginContainer()->RequestTouchEventType(
       WebPluginContainer::kTouchEventRequestTypeRaw);
   WebPlugin* plugin = static_cast<WebPluginContainerBase*>(
                           plugin_container_one_element.PluginContainer())
                           ->Plugin();
   EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin);
 
-  WebTouchEvent event(WebInputEvent::kTouchStart, WebInputEvent::kNoModifiers,
+  {
+    WebTouchEvent event(WebInputEvent::kTouchStart, WebInputEvent::kNoModifiers,

[mustaq, 2017/06/08 20:02:52]

Clarification question: why do we need this?

[Navid Zolghadr, 2017/06/08 21:18:41]

Out code never expects to receive a move coalesced with a press. So they should
come in different rounds. We also check this condition visa CanCoalesce
functions and it only returns true if both of the events are move and otherwise
nothing can get coalesced.

+                        WebInputEvent::kTimeStampForTesting);
+    WebRect rect = plugin_container_one_element.BoundsInViewport();
+    event.touches_length = 1;
+    event.touches[0].state = WebTouchPoint::kStatePressed;
+    event.touches[0].SetPositionInWidget(rect.x + rect.width / 2,
+                                         rect.y + rect.height / 2);
+
+    WebCoalescedInputEvent coalesced_event(event);
+
+    web_view->HandleInputEvent(coalesced_event);
+    RunPendingTasks();
+  }
+
+  WebTouchEvent event(WebInputEvent::kTouchMove, WebInputEvent::kNoModifiers,
                       WebInputEvent::kTimeStampForTesting);
   WebRect rect = plugin_container_one_element.BoundsInViewport();
   event.touches_length = 1;
-  event.touches[0].state = WebTouchPoint::kStatePressed;
+  event.touches[0].state = WebTouchPoint::kStateMoved;
   event.touches[0].SetPositionInWidget(rect.x + rect.width / 2,
                                        rect.y + rect.height / 2);
 
   WebCoalescedInputEvent coalesced_event(event);
 
   WebTouchEvent c_event(WebInputEvent::kTouchMove, WebInputEvent::kNoModifiers,
                         WebInputEvent::kTimeStampForTesting);
   c_event.touches_length = 1;
-  c_event.touches[0].state = WebTouchPoint::kStatePressed;
+  c_event.touches[0].state = WebTouchPoint::kStateMoved;
   c_event.touches[0].SetPositionInWidget(rect.x + rect.width / 2 + 1,
                                          rect.y + rect.height / 2 + 1);
 
   coalesced_event.AddCoalescedEvent(c_event);
   c_event.touches[0].SetPositionInWidget(rect.x + rect.width / 2 + 2,
                                          rect.y + rect.height / 2 + 2);
   coalesced_event.AddCoalescedEvent(c_event);
 
   web_view->HandleInputEvent(coalesced_event);
   RunPendingTasks();
 
-  EXPECT_EQ(static_cast<const size_t>(3),
+  EXPECT_EQ(static_cast<const size_t>(2),
             test_plugin->GetCoalescedEventCount());
-  EXPECT_EQ(WebInputEvent::kTouchStart, test_plugin->GetLastInputEventType());
+  EXPECT_EQ(WebInputEvent::kTouchMove, test_plugin->GetLastInputEventType());
   EXPECT_EQ(rect.width / 2, test_plugin->GetLastEventLocation().X());
   EXPECT_EQ(rect.height / 2, test_plugin->GetLastEventLocation().Y());
 }
 
 TEST_F(WebPluginContainerTest, MouseWheelEventScrolled) {
   RegisterMockedURL("plugin_scroll.html");
   CustomPluginWebFrameClient<EventTestPlugin>
       plugin_web_frame_client;  // Must outlive webViewHelper.
   FrameTestHelpers::WebViewHelper web_view_helper;
   WebView* web_view = web_view_helper.InitializeAndLoad(
@@ skipping 443 matching lines @@
       web_view->MainFrame()->GetDocument().GetElementById(
           WebString::FromUTF8("translated-plugin"));
   plugin_container_one_element.PluginContainer()->SetWantsWheelEvents(true);
 
   RunPendingTasks();
   EXPECT_TRUE(web_view->GetPage()->GetEventHandlerRegistry().HasEventHandlers(
       EventHandlerRegistry::kWheelEventBlocking));
 }
 
 }  // namespace blink