Introducing WebCoalescedInputEvent and inclusion in content/common

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

 // Copyright 2016 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 "platform/geometry/FloatSize.h"
 
 namespace blink {
@@ skipping 201 matching lines @@
     const AtomicString& mouseEventName,
     const PlatformMouseEvent& mouseEvent,
     const Vector<PlatformMouseEvent>& coalescedMouseEvents,
     LocalDOMWindow* view) {
   DCHECK(mouseEventName == EventTypeNames::mousemove ||
          mouseEventName == EventTypeNames::mousedown ||
          mouseEventName == EventTypeNames::mouseup);
 
   AtomicString pointerEventName =
       pointerEventNameForMouseEventName(mouseEventName);
-  DCHECK(pointerEventName == EventTypeNames::pointermove ||
-         coalescedMouseEvents.isEmpty());
 
   unsigned buttons =
       MouseEvent::platformModifiersToButtons(mouseEvent.getModifiers());
   PointerEventInit pointerEventInit;
 
   setIdTypeButtons(pointerEventInit, mouseEvent.pointerProperties(), buttons);
   setEventSpecificFields(pointerEventInit, pointerEventName);
 
   if (pointerEventName == EventTypeNames::pointerdown ||
       pointerEventName == EventTypeNames::pointerup) {
@@ skipping 18 matching lines @@
        (buttons &
         ~buttonToButtonsBitfield(mouseEvent.pointerProperties().button)) !=
            0) ||
       (pointerEventName == EventTypeNames::pointerup && buttons != 0))
     pointerEventName = EventTypeNames::pointermove;
 
   pointerEventInit.setView(view);
 
   updateMousePointerEventInit(mouseEvent, view, &pointerEventInit);
 
-  // Created coalesced events init structure
-  HeapVector<Member<PointerEvent>> coalescedPointerEvents;
-  for (const auto& coalescedMouseEvent : coalescedMouseEvents) {
-    DCHECK_EQ(mouseEvent.pointerProperties().id,
-              coalescedMouseEvent.pointerProperties().id);
-    DCHECK_EQ(mouseEvent.pointerProperties().pointerType,
-              coalescedMouseEvent.pointerProperties().pointerType);
-    PointerEventInit coalescedEventInit = pointerEventInit;
-    updateMousePointerEventInit(coalescedMouseEvent, view, &coalescedEventInit);
-    coalescedPointerEvents.push_back(
-        PointerEvent::create(pointerEventName, coalescedEventInit));
+  // Create coalesced events init structure only for pointermove.
+  if (pointerEventName == EventTypeNames::pointermove) {
+    HeapVector<Member<PointerEvent>> coalescedPointerEvents;
+    for (const auto& coalescedMouseEvent : coalescedMouseEvents) {
+      DCHECK_EQ(mouseEvent.pointerProperties().id,
+                coalescedMouseEvent.pointerProperties().id);
+      DCHECK_EQ(mouseEvent.pointerProperties().pointerType,

[foolip, 2017/01/24 04:56:26]

Filed https://bugs.chromium.org/p/chromium/issues/detail?id=684292 for this
DCHECK_EQ failing on Mac.

+                coalescedMouseEvent.pointerProperties().pointerType);
+      PointerEventInit coalescedEventInit = pointerEventInit;
+      updateMousePointerEventInit(coalescedMouseEvent, view,
+                                  &coalescedEventInit);
+      coalescedPointerEvents.push_back(
+          PointerEvent::create(pointerEventName, coalescedEventInit));
+    }
+    pointerEventInit.setCoalescedEvents(coalescedPointerEvents);
   }
-  pointerEventInit.setCoalescedEvents(coalescedPointerEvents);
 
   return PointerEvent::create(pointerEventName, pointerEventInit);
 }
 
 PointerEvent* PointerEventFactory::create(
     const PlatformTouchPoint& touchPoint,
     const Vector<PlatformTouchPoint>& coalescedPoints,
     PlatformEvent::Modifiers modifiers,
     LocalFrame* targetFrame,
     DOMWindow* view) {
   const PlatformTouchPoint::TouchState pointState = touchPoint.state();
   const AtomicString& type =
       pointerEventNameForTouchPointState(touchPoint.state());
 
-  DCHECK(type == EventTypeNames::pointermove || coalescedPoints.isEmpty());
-
   bool pointerReleasedOrCancelled =
       pointState == PlatformTouchPoint::TouchReleased ||
       pointState == PlatformTouchPoint::TouchCancelled;
   bool pointerPressedOrReleased =
       pointState == PlatformTouchPoint::TouchPressed ||
       pointState == PlatformTouchPoint::TouchReleased;
 
   PointerEventInit pointerEventInit;
 
   setIdTypeButtons(pointerEventInit, touchPoint.pointerProperties(),
                    pointerReleasedOrCancelled ? 0 : 1);
   pointerEventInit.setButton(static_cast<int>(
       pointerPressedOrReleased ? WebPointerProperties::Button::Left
                                : WebPointerProperties::Button::NoButton));
 
   pointerEventInit.setView(view);
   updateTouchPointerEventInit(touchPoint, targetFrame, &pointerEventInit);
 
   UIEventWithKeyState::setFromPlatformModifiers(pointerEventInit, modifiers);
 
   setEventSpecificFields(pointerEventInit, type);
 
-  // Created coalesced events init structure
-  HeapVector<Member<PointerEvent>> coalescedPointerEvents;
-  for (const auto& coalescedTouchPoint : coalescedPoints) {
-    DCHECK_EQ(touchPoint.state(), coalescedTouchPoint.state());
-    DCHECK_EQ(touchPoint.pointerProperties().id,
-              coalescedTouchPoint.pointerProperties().id);
-    DCHECK_EQ(touchPoint.pointerProperties().pointerType,
-              coalescedTouchPoint.pointerProperties().pointerType);
-    PointerEventInit coalescedEventInit = pointerEventInit;
-    updateTouchPointerEventInit(coalescedTouchPoint, targetFrame,
-                                &coalescedEventInit);
-    coalescedPointerEvents.push_back(
-        PointerEvent::create(type, coalescedEventInit));
+  if (type == EventTypeNames::pointermove) {
+    HeapVector<Member<PointerEvent>> coalescedPointerEvents;
+    for (const auto& coalescedTouchPoint : coalescedPoints) {
+      DCHECK_EQ(touchPoint.state(), coalescedTouchPoint.state());
+      DCHECK_EQ(touchPoint.pointerProperties().id,
+                coalescedTouchPoint.pointerProperties().id);
+      DCHECK_EQ(touchPoint.pointerProperties().pointerType,
+                coalescedTouchPoint.pointerProperties().pointerType);
+      PointerEventInit coalescedEventInit = pointerEventInit;
+      updateTouchPointerEventInit(coalescedTouchPoint, targetFrame,
+                                  &coalescedEventInit);
+      coalescedPointerEvents.push_back(
+          PointerEvent::create(type, coalescedEventInit));
+    }
+    pointerEventInit.setCoalescedEvents(coalescedPointerEvents);
   }
-  pointerEventInit.setCoalescedEvents(coalescedPointerEvents);
 
   return PointerEvent::create(type, pointerEventInit);
 }
 
 PointerEvent* PointerEventFactory::createPointerCancelEvent(
     const int pointerId,
     const WebPointerProperties::PointerType pointerType) {
   DCHECK(m_pointerIdMapping.contains(pointerId));
   m_pointerIdMapping.set(
       pointerId,
@@ skipping 175 matching lines @@
     const WebPointerProperties& properties) const {
   if (properties.pointerType == WebPointerProperties::PointerType::Mouse)
     return PointerEventFactory::s_mouseId;
   IncomingId id(properties.pointerType, properties.id);
   if (m_pointerIncomingIdMapping.contains(id))
     return m_pointerIncomingIdMapping.get(id);
   return PointerEventFactory::s_invalidId;
 }
 
 }  // namespace blink