Revert "Send got/lostpointercapture immediately if possible"

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

 // 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.
 
 #ifndef PointerEventFactory_h
 #define PointerEventFactory_h
 
 #include "core/CoreExport.h"
 #include "core/events/PointerEvent.h"
 #include "public/platform/WebPointerProperties.h"
@@ skipping 27 matching lines @@
         const PlatformTouchPoint&, PlatformEvent::Modifiers,
         const FloatSize& pointRadius,
         const FloatPoint& clientPoint,
         DOMWindow*);
 
     PointerEvent* createPointerCancelEvent(
         const int pointerId, const WebPointerProperties::PointerType);
 
     // For creating capture events (i.e got/lostpointercapture)
     PointerEvent* createPointerCaptureEvent(
-        const int pointerId,
+        PointerEvent*,
         const AtomicString&);
 
     // For creating boundary events (i.e pointerout/leave/over/enter)
     PointerEvent* createPointerBoundaryEvent(
         PointerEvent*,
         const AtomicString&,
         EventTarget*);
 
     // Clear all the existing ids.
     void clear();
@@ skipping 16 matching lines @@
     // properties if exists otherwise s_invalidId.
     int getPointerEventId(const WebPointerProperties&) const;
 
 private:
     typedef WTF::UnsignedWithZeroKeyHashTraits<int> UnsignedHash;
     typedef struct IncomingId : public std::pair<int, int> {
         IncomingId() {}
         IncomingId(WebPointerProperties::PointerType pointerType,
             int rawId)
             : std::pair<int, int>(static_cast<int>(pointerType), rawId) {}
-        WebPointerProperties::PointerType pointerType() const { return static_cast<WebPointerProperties::PointerType>(first); }
-        int pointerTypeInt() const { return first; }
-        int rawId() const { return second; }
+        int pointerType() const {return first;}
+        int rawId() const {return second;}
     } IncomingId;
     typedef struct PointerAttributes {
         IncomingId incomingId;
         bool isActiveButtons;
         PointerAttributes() {}
         PointerAttributes(IncomingId incomingId, unsigned isActiveButtons)
         : incomingId(incomingId)
         , isActiveButtons(isActiveButtons) {}
     } PointerAttributes;
 
     int addIdAndActiveButtons(const IncomingId, bool isActiveButtons);
     bool isPrimary(const int) const;
     void setIdTypeButtons(PointerEventInit&, const WebPointerProperties&,
         unsigned buttons);
     void setBubblesAndCancelable(PointerEventInit&, const AtomicString& type);
 
     static const int s_invalidId;
     static const int s_mouseId;
 
     int m_currentId;
     HashMap<IncomingId, int, WTF::PairHash<int, int>, WTF::PairHashTraits<UnsignedHash, UnsignedHash>> m_pointerIncomingIdMapping;
     HashMap<int, PointerAttributes, WTF::IntHash<int>, UnsignedHash> m_pointerIdMapping;
     int m_primaryId[static_cast<int>(WebPointerProperties::PointerType::LastEntry) + 1];
     int m_idCount[static_cast<int>(WebPointerProperties::PointerType::LastEntry) + 1];
 };
 
 } // namespace blink
 
 #endif // PointerEventFactory_h