Fixed composed & detail fields in PointerEvents.

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 95 matching lines @@
     buttons &= ~static_cast<unsigned>(WebPointerProperties::Buttons::Left);
   }
   pointerEventInit.setButtons(buttons);
 
   pointerEventInit.setPointerId(pointerId);
   pointerEventInit.setPointerType(
       pointerTypeNameForWebPointPointerType(pointerType));
   pointerEventInit.setIsPrimary(isPrimary(pointerId));
 }
 
-void PointerEventFactory::setBubblesAndCancelable(
+void PointerEventFactory::setEventSpecificFields(
     PointerEventInit& pointerEventInit,
     const AtomicString& type) {
   pointerEventInit.setBubbles(type != EventTypeNames::pointerenter &&
                               type != EventTypeNames::pointerleave);
   pointerEventInit.setCancelable(type != EventTypeNames::pointerenter &&
                                  type != EventTypeNames::pointerleave &&
                                  type != EventTypeNames::pointercancel &&
                                  type != EventTypeNames::gotpointercapture &&
                                  type != EventTypeNames::lostpointercapture);
+
+  pointerEventInit.setComposed(true);
+  pointerEventInit.setDetail(0);
 }
 
 PointerEvent* PointerEventFactory::create(const AtomicString& mouseEventName,
                                           const PlatformMouseEvent& mouseEvent,
                                           LocalDOMWindow* view) {
   DCHECK(mouseEventName == EventTypeNames::mousemove ||
          mouseEventName == EventTypeNames::mousedown ||
          mouseEventName == EventTypeNames::mouseup);
 
   AtomicString pointerEventName =
       pointerEventNameForMouseEventName(mouseEventName);
   unsigned buttons =
       MouseEvent::platformModifiersToButtons(mouseEvent.getModifiers());
   PointerEventInit pointerEventInit;
 
   setIdTypeButtons(pointerEventInit, mouseEvent.pointerProperties(), buttons);
-  setBubblesAndCancelable(pointerEventInit, pointerEventName);
+  setEventSpecificFields(pointerEventInit, pointerEventName);
 
   pointerEventInit.setScreenX(mouseEvent.globalPosition().x());
   pointerEventInit.setScreenY(mouseEvent.globalPosition().y());
 
   IntPoint locationInFrameZoomed;
   if (view && view->frame() && view->frame()->view()) {
     LocalFrame* frame = view->frame();
     FrameView* frameView = frame->view();
     IntPoint locationInContents =
         frameView->rootFrameToContents(mouseEvent.position());
@@ skipping 49 matching lines @@
                                           DOMWindow* view) {
   const PlatformTouchPoint::TouchState pointState = touchPoint.state();
 
   bool pointerReleasedOrCancelled =
       pointState == PlatformTouchPoint::TouchReleased ||
       pointState == PlatformTouchPoint::TouchCancelled;
   bool pointerPressedOrReleased =
       pointState == PlatformTouchPoint::TouchPressed ||
       pointState == PlatformTouchPoint::TouchReleased;
 
-  bool isEnterOrLeave = false;
-
   PointerEventInit pointerEventInit;
 
   setIdTypeButtons(pointerEventInit, touchPoint.pointerProperties(),
                    pointerReleasedOrCancelled ? 0 : 1);
 
   pointerEventInit.setWidth(pointRadius.width());
   pointerEventInit.setHeight(pointRadius.height());
   pointerEventInit.setScreenX(touchPoint.screenPos().x());
   pointerEventInit.setScreenY(touchPoint.screenPos().y());
   pointerEventInit.setClientX(clientPoint.x());
   pointerEventInit.setClientY(clientPoint.y());
   pointerEventInit.setButton(static_cast<int>(
       pointerPressedOrReleased ? WebPointerProperties::Button::Left
                                : WebPointerProperties::Button::NoButton));
   pointerEventInit.setPressure(
       getPointerEventPressure(touchPoint.force(), pointerEventInit.buttons()));
   pointerEventInit.setTiltX(touchPoint.pointerProperties().tiltX);
   pointerEventInit.setTiltY(touchPoint.pointerProperties().tiltY);
   pointerEventInit.setView(view);
 
   UIEventWithKeyState::setFromPlatformModifiers(pointerEventInit, modifiers);
 
-  pointerEventInit.setBubbles(!isEnterOrLeave);
-  pointerEventInit.setCancelable(
-      !isEnterOrLeave && pointState != PlatformTouchPoint::TouchCancelled);
+  setEventSpecificFields(pointerEventInit, type);
 
   return PointerEvent::create(type, pointerEventInit);
 }
 
 PointerEvent* PointerEventFactory::createPointerCancelEvent(
     const int pointerId,
     const WebPointerProperties::PointerType pointerType) {
   DCHECK(m_pointerIdMapping.contains(pointerId));
   m_pointerIdMapping.set(
       pointerId,
       PointerAttributes(m_pointerIdMapping.get(pointerId).incomingId, false));
 
   PointerEventInit pointerEventInit;
 
   pointerEventInit.setPointerId(pointerId);
   pointerEventInit.setPointerType(
       pointerTypeNameForWebPointPointerType(pointerType));
   pointerEventInit.setIsPrimary(isPrimary(pointerId));
-  pointerEventInit.setBubbles(true);
-  pointerEventInit.setCancelable(false);
+
+  setEventSpecificFields(pointerEventInit, EventTypeNames::pointercancel);
 
   return PointerEvent::create(EventTypeNames::pointercancel, pointerEventInit);
 }
 
 PointerEvent* PointerEventFactory::createPointerEventFrom(
     PointerEvent* pointerEvent,
     const AtomicString& type,
     EventTarget* relatedTarget) {
   PointerEventInit pointerEventInit;
 
   pointerEventInit.setPointerId(pointerEvent->pointerId());
   pointerEventInit.setPointerType(pointerEvent->pointerType());
   pointerEventInit.setIsPrimary(pointerEvent->isPrimary());
   pointerEventInit.setWidth(pointerEvent->width());
   pointerEventInit.setHeight(pointerEvent->height());
   pointerEventInit.setScreenX(pointerEvent->screenX());
   pointerEventInit.setScreenY(pointerEvent->screenY());
   pointerEventInit.setClientX(pointerEvent->clientX());
   pointerEventInit.setClientY(pointerEvent->clientY());
   pointerEventInit.setButton(pointerEvent->button());
   pointerEventInit.setButtons(pointerEvent->buttons());
   pointerEventInit.setPressure(pointerEvent->pressure());
   pointerEventInit.setTiltX(pointerEvent->tiltX());
   pointerEventInit.setTiltY(pointerEvent->tiltY());
   pointerEventInit.setView(pointerEvent->view());
 
-  setBubblesAndCancelable(pointerEventInit, type);
+  setEventSpecificFields(pointerEventInit, type);
 
   if (relatedTarget)
     pointerEventInit.setRelatedTarget(relatedTarget);
 
   return PointerEvent::create(type, pointerEventInit);
 }
 
 PointerEvent* PointerEventFactory::createPointerCaptureEvent(
     PointerEvent* pointerEvent,
     const AtomicString& type) {
@@ skipping 128 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