Introducing WebCoalescedInputEvent and inclusion in content/common

third_party/WebKit/Source/web/PageWidgetDelegate.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 96 matching lines @@
 
 void PageWidgetDelegate::paintIgnoringCompositing(Page& page,
                                                   WebCanvas* canvas,
                                                   const WebRect& rect,
                                                   LocalFrame& root) {
   paintInternal(page, canvas, rect, root, GlobalPaintFlattenCompositingLayers);
 }
 
 WebInputEventResult PageWidgetDelegate::handleInputEvent(
     PageWidgetEventHandler& handler,
-    const WebInputEvent& event,
+    const WebCoalescedInputEvent& coalescedEvent,
     LocalFrame* root) {
+  const WebInputEvent& event = coalescedEvent.event();
   if (event.modifiers & WebInputEvent::IsTouchAccessibility &&
       WebInputEvent::isMouseEventType(event.type)) {
     PlatformMouseEventBuilder pme(root->view(),
                                   static_cast<const WebMouseEvent&>(event));
 
     IntPoint docPoint(root->view()->rootFrameToContents(pme.position()));
     HitTestResult result = root->eventHandler().hitTestResultAtPoint(
         docPoint, HitTestRequest::ReadOnly | HitTestRequest::Active);
     result.setToShadowHostIfInUserAgentShadowRoot();
     if (result.innerNodeFrame()) {
@@ skipping 10 matching lines @@
   switch (event.type) {
     // FIXME: WebKit seems to always return false on mouse events processing
     // methods. For now we'll assume it has processed them (as we are only
     // interested in whether keyboard events are processed).
     // FIXME: Why do we return HandleSuppressed when there is no root or
     // the root is detached?
     case WebInputEvent::MouseMove:
       if (!root || !root->view())
         return WebInputEventResult::HandledSuppressed;
       handler.handleMouseMove(*root, static_cast<const WebMouseEvent&>(event),
-                              std::vector<const WebInputEvent*>());
+                              coalescedEvent.getCoalescedEventsPointers());
       return WebInputEventResult::HandledSystem;
     case WebInputEvent::MouseLeave:
       if (!root || !root->view())
         return WebInputEventResult::HandledSuppressed;
       handler.handleMouseLeave(*root, static_cast<const WebMouseEvent&>(event));
       return WebInputEventResult::HandledSystem;
     case WebInputEvent::MouseDown:
       if (!root || !root->view())
         return WebInputEventResult::HandledSuppressed;
       handler.handleMouseDown(*root, static_cast<const WebMouseEvent&>(event));
@@ skipping 35 matching lines @@
       return handler.handleGestureEvent(
           static_cast<const WebGestureEvent&>(event));
 
     case WebInputEvent::TouchStart:
     case WebInputEvent::TouchMove:
     case WebInputEvent::TouchEnd:
     case WebInputEvent::TouchCancel:
     case WebInputEvent::TouchScrollStarted:
       if (!root || !root->view())
         return WebInputEventResult::NotHandled;
-      return handler.handleTouchEvent(*root,
-                                      static_cast<const WebTouchEvent&>(event),
-                                      std::vector<const WebInputEvent*>());
+      return handler.handleTouchEvent(
+          *root, static_cast<const WebTouchEvent&>(event),
+          coalescedEvent.getCoalescedEventsPointers());
     case WebInputEvent::GesturePinchBegin:
     case WebInputEvent::GesturePinchEnd:
     case WebInputEvent::GesturePinchUpdate:
       // Touchscreen pinch events are currently not handled in main thread.
       // Once they are, these should be passed to |handleGestureEvent| similar
       // to gesture scroll events.
       return WebInputEventResult::NotHandled;
     default:
       return WebInputEventResult::NotHandled;
   }
@@ skipping 39 matching lines @@
 WebInputEventResult PageWidgetEventHandler::handleTouchEvent(
     LocalFrame& mainFrame,
     const WebTouchEvent& event,
     const std::vector<const WebInputEvent*>& coalescedEvents) {
   return mainFrame.eventHandler().handleTouchEvent(
       PlatformTouchEventBuilder(mainFrame.view(), event),
       createPlatformTouchEventVector(mainFrame.view(), coalescedEvents));
 }
 
 }  // namespace blink