Keep track of coalesced events in main thread event queue

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

 /*
  * Copyright (C) 2010 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 5828 matching lines @@
     EXPECT_GE(targetRects.size(), 2u);
     m_triggered = true;
     return true;
   }
 
   bool triggered() const { return m_triggered; }
   void resetTriggered() { m_triggered = false; }
   bool m_triggered;
 };
 
-static WebGestureEvent fatTap(int x, int y) {
+static WebCoalescedInputEvent fatTap(int x, int y) {
   WebGestureEvent event(WebInputEvent::GestureTap, WebInputEvent::NoModifiers,
                         WebInputEvent::TimeStampForTesting);
   event.sourceDevice = WebGestureDeviceTouchscreen;
   event.x = x;
   event.y = y;
   event.data.tap.width = 50;
   event.data.tap.height = 50;
-  return event;
+  return WebCoalescedInputEvent(event);
 }
 
 TEST_P(ParameterizedWebFrameTest, DisambiguationPopup) {
   const std::string htmlFile = "disambiguation_popup.html";
   registerMockedHttpURLLoad(htmlFile);
 
   DisambiguationPopupTestWebViewClient client;
 
   // Make sure we initialize to minimum scale, even if the window size
   // only becomes available after the load begins.
@@ skipping 3851 matching lines @@
                void(const WebFloatSize&,
                     const WebFloatSize&,
                     const WebFloatPoint&,
                     const WebFloatSize&));
 };
 
 class WebFrameOverscrollTest
     : public WebFrameTest,
       public ::testing::WithParamInterface<blink::WebGestureDevice> {
  protected:
-  WebGestureEvent generateEvent(WebInputEvent::Type type,
-                                float deltaX = 0.0,
-                                float deltaY = 0.0) {
+  WebCoalescedInputEvent generateEvent(WebInputEvent::Type type,
+                                       float deltaX = 0.0,
+                                       float deltaY = 0.0) {
     WebGestureEvent event(type, WebInputEvent::NoModifiers,
                           WebInputEvent::TimeStampForTesting);
     // TODO(wjmaclean): Make sure that touchpad device is only ever used for
     // gesture scrolling event types.
     event.sourceDevice = GetParam();
     event.x = 100;
     event.y = 100;
     if (type == WebInputEvent::GestureScrollUpdate) {
       event.data.scrollUpdate.deltaX = deltaX;
       event.data.scrollUpdate.deltaY = deltaY;
     }
-    return event;
+    return WebCoalescedInputEvent(event);
   }
 
   void ScrollBegin(FrameTestHelpers::WebViewHelper* webViewHelper) {
     webViewHelper->webView()->handleInputEvent(
         generateEvent(WebInputEvent::GestureScrollBegin));
   }
 
   void ScrollUpdate(FrameTestHelpers::WebViewHelper* webViewHelper,
                     float deltaX,
                     float deltaY) {
@@ skipping 923 matching lines @@
                               WebInputEvent::NoModifiers,
                               WebInputEvent::TimeStampForTesting);
   updateEvent.sourceDevice = WebGestureDeviceTouchpad;
   WebGestureEvent endEvent(WebInputEvent::GestureScrollEnd,
                            WebInputEvent::NoModifiers,
                            WebInputEvent::TimeStampForTesting);
   endEvent.sourceDevice = WebGestureDeviceTouchpad;
 
   // Try GestureScrollEnd and GestureScrollUpdate first to make sure that not
   // seeing a Begin first doesn't break anything. (This currently happens).
-  webViewHelper.webView()->handleInputEvent(endEvent);
-  webViewHelper.webView()->handleInputEvent(updateEvent);
+  webViewHelper.webView()->handleInputEvent(WebCoalescedInputEvent(endEvent));
+  webViewHelper.webView()->handleInputEvent(
+      WebCoalescedInputEvent(updateEvent));
 
   // Try a full Begin/Update/End cycle.
-  webViewHelper.webView()->handleInputEvent(beginEvent);
-  webViewHelper.webView()->handleInputEvent(updateEvent);
-  webViewHelper.webView()->handleInputEvent(endEvent);
+  webViewHelper.webView()->handleInputEvent(WebCoalescedInputEvent(beginEvent));
+  webViewHelper.webView()->handleInputEvent(
+      WebCoalescedInputEvent(updateEvent));
+  webViewHelper.webView()->handleInputEvent(WebCoalescedInputEvent(endEvent));
 }
 
 TEST_F(WebFrameTest, HidingScrollbarsOnScrollableAreaDisablesScrollbars) {
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initialize(true);
   webViewHelper.resize(WebSize(800, 600));
   WebViewImpl* webView = webViewHelper.webView();
 
   initializeWithHTML(
       *webView->mainFrameImpl()->frame(),
@@ skipping 528 matching lines @@
 
   EXPECT_TRUE(mainFrameClient.childClient().didCallFrameDetached());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidStopLoading());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidFinishDocumentLoad());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidHandleOnloadEvents());
 
   webViewHelper.reset();
 }
 
 }  // namespace blink