Support Coalesced Touch in ppapi

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 434 matching lines @@
   EXPECT_EQ(WebString("x"), Platform::Current()->Clipboard()->ReadPlainText(
                                 WebClipboard::Buffer()));
 }
 
 // A class to facilitate testing that events are correctly received by plugins.
 class EventTestPlugin : public FakeWebPlugin {
  public:
   explicit EventTestPlugin(const WebPluginParams& params)
       : FakeWebPlugin(params), last_event_type_(WebInputEvent::kUndefined) {}
 
-  WebInputEventResult HandleInputEvent(const WebInputEvent& event,
-                                       WebCursorInfo&) override {
+  WebInputEventResult HandleInputEvent(
+      const WebCoalescedInputEvent& coalesced_event,
+      WebCursorInfo&) override {
+    const WebInputEvent& event = coalesced_event.Event();
     last_event_type_ = event.GetType();
     if (WebInputEvent::IsMouseEventType(event.GetType()) ||
         event.GetType() == WebInputEvent::kMouseWheel) {
       const WebMouseEvent& mouse_event =
           static_cast<const WebMouseEvent&>(event);
       last_event_location_ = IntPoint(mouse_event.PositionInWidget().x,
                                       mouse_event.PositionInWidget().y);
     } else if (WebInputEvent::IsTouchEventType(event.GetType())) {
       const WebTouchEvent& touch_event =
           static_cast<const WebTouchEvent&>(event);
@@ skipping 138 matching lines @@
       WebFloatPoint(rect.x + rect.width / 2, rect.y + rect.height / 2);
 
   web_view->HandleInputEvent(WebCoalescedInputEvent(event));
   RunPendingTasks();
 
   EXPECT_EQ(WebInputEvent::kTouchStart, test_plugin->GetLastInputEventType());
   EXPECT_EQ(rect.width / 2, test_plugin->GetLastEventLocation().X());
   EXPECT_EQ(rect.height / 2, test_plugin->GetLastEventLocation().Y());
 }
 
+TEST_F(WebPluginContainerTest, TouchEventScrolledWithCoalescedTouches) {
+  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(
+      base_url_ + "plugin_scroll.html", true, &plugin_web_frame_client);
+  DCHECK(web_view);
+  web_view->GetSettings()->SetPluginsEnabled(true);
+  web_view->Resize(WebSize(300, 300));
+  web_view->UpdateAllLifecyclePhases();
+  RunPendingTasks();
+  web_view->SmoothScroll(0, 200, 0);
+  web_view->UpdateAllLifecyclePhases();
+  RunPendingTasks();
+
+  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<WebPluginContainerImpl*>(
+                          plugin_container_one_element.PluginContainer())
+                          ->Plugin();
+  EventTestPlugin* test_plugin = static_cast<EventTestPlugin*>(plugin);
+
+  WebTouchEvent event(WebInputEvent::kTouchStart, WebInputEvent::kNoModifiers,
+                      WebInputEvent::kTimeStampForTesting);
+  WebRect rect = plugin_container_one_element.BoundsInViewport();
+  event.touches_length = 1;
+  event.touches[0].state = WebTouchPoint::kStatePressed;
+  event.touches[0].position =
+      WebFloatPoint(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].position =
+      WebFloatPoint(rect.x + rect.width / 2 + 1, rect.y + rect.height / 2 + 1);
+
+  coalesced_event.AddCoalescedEvent(c_event);
+  c_event.touches[0].position =
+      WebFloatPoint(rect.x + rect.width / 2 + 2, rect.y + rect.height / 2 + 2);
+  coalesced_event.AddCoalescedEvent(c_event);
+
+  web_view->HandleInputEvent(coalesced_event);

[dtapuska, 2017/05/08 13:11:15]

You should likely store how many coalesced events were seen in the
EventTestPlugin override
(https://cs.chromium.org/chromium/src/third_party/WebKit/Source/web/tests/WebP...)
and then have an EXPECT_EQ here...

[jkwang, 2017/05/08 17:26:53]

Done.

+  RunPendingTasks();
+
+  EXPECT_EQ(WebInputEvent::kTouchStart, 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(
       base_url_ + "plugin_scroll.html", true, &plugin_web_frame_client);
   DCHECK(web_view);
   web_view->GetSettings()->SetPluginsEnabled(true);
   web_view->Resize(WebSize(300, 300));
@@ skipping 439 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