Fix properties of got/lostpointercapture

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

Index: third_party/WebKit/Source/core/events/PointerEventFactory.cpp
diff --git a/third_party/WebKit/Source/core/events/PointerEventFactory.cpp b/third_party/WebKit/Source/core/events/PointerEventFactory.cpp
index cc50085728994221c566246b27b820a06f5ede5c..ee8be8ce29fcef2da9c9ba4d09b7f9d7b7d8da1f 100644
--- a/third_party/WebKit/Source/core/events/PointerEventFactory.cpp
+++ b/third_party/WebKit/Source/core/events/PointerEventFactory.cpp
@@ -25,7 +25,7 @@ const char* pointerTypeNameForWebPointPointerType(WebPointerProperties::PointerT
     case WebPointerProperties::PointerType::Mouse:
         return "mouse";
     }
-    ASSERT_NOT_REACHED();
+    NOTREACHED();
     return "";
 }
 
@@ -47,7 +47,7 @@ const AtomicString& pointerEventNameForMouseEventName(
 
 #undef RETURN_CORRESPONDING_PE_NAME
 
-    ASSERT_NOT_REACHED();
+    NOTREACHED();
     return emptyAtom;
 }
 
@@ -78,13 +78,16 @@ void PointerEventFactory::setIdTypeButtons(PointerEventInit& pointerEventInit,
     pointerEventInit.setIsPrimary(isPrimary(pointerId));
 }
 
-void PointerEventFactory::setBubblesAndCancelable(PointerEventInit& pointerEventInit,
-    const AtomicString& type)
+void PointerEventFactory::setBubblesAndCancelable(
+    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::pointerleave
+        && type != EventTypeNames::pointercancel
+        && type != EventTypeNames::gotpointercapture
+        && type != EventTypeNames::lostpointercapture);
 }
 
 PointerEvent* PointerEventFactory::create(
@@ -193,7 +196,7 @@ PointerEvent* PointerEventFactory::create(const AtomicString& type,
 PointerEvent* PointerEventFactory::createPointerCancelEvent(
     const int pointerId, const WebPointerProperties::PointerType pointerType)
 {
-    ASSERT(m_pointerIdMapping.contains(pointerId));
+    DCHECK(m_pointerIdMapping.contains(pointerId));
     m_pointerIdMapping.set(pointerId, PointerAttributes(m_pointerIdMapping.get(pointerId).incomingId, false));
 
     PointerEventInit pointerEventInit;
@@ -207,33 +210,11 @@ PointerEvent* PointerEventFactory::createPointerCancelEvent(
     return PointerEvent::create(EventTypeNames::pointercancel, pointerEventInit);
 }
 
-PointerEvent* PointerEventFactory::createPointerCaptureEvent(
-    PointerEvent* pointerEvent,
-    const AtomicString& type)
-{
-    ASSERT(type == EventTypeNames::gotpointercapture
-        || type == EventTypeNames::lostpointercapture);
-
-    PointerEventInit pointerEventInit;
-    pointerEventInit.setPointerId(pointerEvent->pointerId());
-    pointerEventInit.setPointerType(pointerEvent->pointerType());
-    pointerEventInit.setIsPrimary(pointerEvent->isPrimary());
-    pointerEventInit.setBubbles(true);
-    pointerEventInit.setCancelable(false);
-
-    return PointerEvent::create(type, pointerEventInit);
-}
-
-PointerEvent* PointerEventFactory::createPointerBoundaryEvent(
+PointerEvent* PointerEventFactory::createSecondaryPointerEvent(

[mustaq, 2016/08/05 15:51:22]

This is now a generic PE creator method, so "secondary" doesn't make sense. What
about "createFrom()"?

Please update the description in .h accordingly.

[Navid Zolghadr, 2016/08/05 17:08:03]

Done.

     PointerEvent* pointerEvent,
     const AtomicString& type,
     EventTarget* relatedTarget)
 {
-    ASSERT(type == EventTypeNames::pointerout
-        || type == EventTypeNames::pointerleave
-        || type == EventTypeNames::pointerover
-        || type == EventTypeNames::pointerenter);
-
     PointerEventInit pointerEventInit;
 
     pointerEventInit.setPointerId(pointerEvent->pointerId());
@@ -260,6 +241,30 @@ PointerEvent* PointerEventFactory::createPointerBoundaryEvent(
     return PointerEvent::create(type, pointerEventInit);
 }
 
+PointerEvent* PointerEventFactory::createPointerCaptureEvent(

[mustaq, 2016/08/05 15:51:22]

Let's drop createPointerCaptureEvent & createPointerBoundaryEvent to clean the
interface. The DCHECKs themselves don't add any value IMO.

[Navid Zolghadr, 2016/08/05 17:08:03]

I would say let's keep the APIs different as one needs a relatedTarget and the
other should not have a relatedTarget. So defaulting that to null doesn't make
it as clear as this possibly.

[mustaq, 2016/08/05 17:29:17]

Acknowledged.

+    PointerEvent* pointerEvent,
+    const AtomicString& type)
+{
+    DCHECK(type == EventTypeNames::gotpointercapture
+        || type == EventTypeNames::lostpointercapture);
+
+    return createSecondaryPointerEvent(
+        pointerEvent, type, pointerEvent->relatedTarget());
+}
+
+PointerEvent* PointerEventFactory::createPointerBoundaryEvent(
+    PointerEvent* pointerEvent,
+    const AtomicString& type,
+    EventTarget* relatedTarget)
+{
+    DCHECK(type == EventTypeNames::pointerout
+        || type == EventTypeNames::pointerleave
+        || type == EventTypeNames::pointerover
+        || type == EventTypeNames::pointerenter);
+
+    return createSecondaryPointerEvent(pointerEvent, type, relatedTarget);
+}
+
 PointerEventFactory::PointerEventFactory()
 {
     clear();