Cleaning up PointerIdManager and add id re-mapping

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

Index: third_party/WebKit/Source/core/events/PointerEventFactoryTest.cpp
diff --git a/third_party/WebKit/Source/core/events/PointerEventFactoryTest.cpp b/third_party/WebKit/Source/core/events/PointerEventFactoryTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..3569bb14ec0d7fc0d26c3848d57fb58f0bde7130
--- /dev/null
+++ b/third_party/WebKit/Source/core/events/PointerEventFactoryTest.cpp
@@ -0,0 +1,219 @@
+// Copyright 2015 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 "config.h"
+#include "core/events/PointerEventFactory.h"
+
+#include "core/frame/FrameView.h"
+#include "core/page/Page.h"
+#include "public/platform/WebPointerProperties.h"
+#include <climits>
+#include <gtest/gtest.h>
+
+namespace blink {
+
+class PointerEventFactoryTest : public ::testing::Test {
+protected:
+    void SetUp() override;
+    PassRefPtrWillBeRawPtr<PointerEvent> createAndCheckTouchEvent(
+        WebPointerProperties::PointerType, int rawId,
+        int uniqueId, bool isPrimary);
+    PassRefPtrWillBeRawPtr<PointerEvent> createAndCheckMouseEvent(
+        WebPointerProperties::PointerType, int rawId,
+        int uniqueId, bool isPrimary);
+
+    PointerEventFactory m_pointerEventFactory;
+    unsigned m_expectedMouseId;
+    unsigned m_mappedIdStart;
+
+    class PlatformTouchPointBuilder : public PlatformTouchPoint {
+    public:
+        PlatformTouchPointBuilder(WebPointerProperties::PointerType, int);
+    };
+
+    class PlatformMouseEventBuilder : public PlatformMouseEvent {
+    public:
+        PlatformMouseEventBuilder(WebPointerProperties::PointerType, int);
+    };
+};
+
+void PointerEventFactoryTest::SetUp()
+{
+    m_expectedMouseId = 1;
+    m_mappedIdStart = 2;
+
+}
+
+PointerEventFactoryTest::PlatformTouchPointBuilder::PlatformTouchPointBuilder(
+    WebPointerProperties::PointerType pointerType, int id)
+: PlatformTouchPoint()

[mustaq, 2015/12/02 15:53:46]

This call could be implicit I guess?

[Navid Zolghadr, 2015/12/02 16:49:08]

Done.

+{
+    m_pointerProperties.id = id;
+    m_pointerProperties.pointerType = pointerType;
+}
+
+PointerEventFactoryTest::PlatformMouseEventBuilder::PlatformMouseEventBuilder(
+    WebPointerProperties::PointerType pointerType, int id)
+: PlatformMouseEvent()
+{
+    m_pointerProperties.pointerType = pointerType;
+    m_pointerProperties.id = id;
+}
+
+PassRefPtrWillBeRawPtr<PointerEvent> PointerEventFactoryTest::createAndCheckTouchEvent(
+    WebPointerProperties::PointerType pointerType, int rawId,
+    int uniqueId, bool isPrimary)
+{
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent = m_pointerEventFactory.create(
+        EventTypeNames::pointerdown, PointerEventFactoryTest::PlatformTouchPointBuilder(pointerType, rawId), PlatformEvent::NoModifiers, 0, 0, 0, 0);
+    EXPECT_EQ(uniqueId, pointerEvent->pointerId());
+    EXPECT_EQ(isPrimary, pointerEvent->isPrimary());
+    return pointerEvent;
+}
+
+PassRefPtrWillBeRawPtr<PointerEvent> PointerEventFactoryTest::createAndCheckMouseEvent(
+    WebPointerProperties::PointerType pointerType, int rawId, int uniqueId, bool isPrimary)
+{
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent = m_pointerEventFactory.create(
+        EventTypeNames::pointerenter, PlatformMouseEventBuilder(pointerType, rawId), nullptr, nullptr);
+    EXPECT_EQ(uniqueId, pointerEvent->pointerId());
+    EXPECT_EQ(isPrimary, pointerEvent->isPrimary());
+    return pointerEvent;
+}
+
+TEST_F(PointerEventFactoryTest, MousePointer)
+{
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent1 = createAndCheckMouseEvent(WebPointerProperties::PointerType::Mouse, 0, m_expectedMouseId, true);
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent2 = createAndCheckMouseEvent(WebPointerProperties::PointerType::Mouse, 0, m_expectedMouseId, true);
+
+    m_pointerEventFactory.remove(pointerEvent1);
+
+    createAndCheckMouseEvent(WebPointerProperties::PointerType::Mouse, 0, m_expectedMouseId, true);
+
+    m_pointerEventFactory.remove(pointerEvent1);
+    m_pointerEventFactory.remove(pointerEvent2);
+
+    createAndCheckMouseEvent(WebPointerProperties::PointerType::Mouse, 1, m_expectedMouseId, true);
+    createAndCheckMouseEvent(WebPointerProperties::PointerType::Mouse, 20, m_expectedMouseId, true);
+}
+
+TEST_F(PointerEventFactoryTest, TouchPointerPrimaryRemovedWhileAnotherIsThere)
+{
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent1 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent2 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 1, m_mappedIdStart+1, false);
+
+    m_pointerEventFactory.remove(pointerEvent1);
+
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent3 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 2, m_mappedIdStart+2, false);
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent4 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 1, m_mappedIdStart+1, false);
+}
+
+TEST_F(PointerEventFactoryTest, TouchPointerReleasedAndPressedAgain)
+{
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent1 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent2 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 1, m_mappedIdStart+1, false);
+
+    m_pointerEventFactory.remove(pointerEvent1);
+    m_pointerEventFactory.remove(pointerEvent2);
+
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent3 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 1, m_mappedIdStart+2, true);
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent4 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart+3, false);
+
+    m_pointerEventFactory.clear();
+
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent5 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 10, m_mappedIdStart+4, true);
+}
+
+TEST_F(PointerEventFactoryTest, TouchAndDrag)
+{
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent1 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent2 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent3 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
+
+    m_pointerEventFactory.remove(pointerEvent1);
+    m_pointerEventFactory.remove(pointerEvent2);
+
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent4 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart+1, true);
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent5 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart+1, true);
+
+    // Remove an obsolete (i.e. already removed) pointer event which should have no effect
+    m_pointerEventFactory.remove(pointerEvent1);
+
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent6 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart+1, true);
+}
+
+TEST_F(PointerEventFactoryTest, MouseAndTouchAndPen)
+{
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent1 = createAndCheckMouseEvent(WebPointerProperties::PointerType::Mouse, 0, m_expectedMouseId, true);
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent2 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent3 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Pen, 0, m_mappedIdStart+1, true);
+
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent4 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 1, m_mappedIdStart+2, false);
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent5 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 2, m_mappedIdStart+3, false);
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent6 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Pen, 0, m_mappedIdStart+1, true);
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent7 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Pen, 47213, m_mappedIdStart+4, false);
+
+    m_pointerEventFactory.remove(pointerEvent2);
+    m_pointerEventFactory.remove(pointerEvent4);
+    m_pointerEventFactory.remove(pointerEvent5);
+
+    createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 100, m_mappedIdStart+5, true);
+
+    m_pointerEventFactory.clear();
+
+    createAndCheckMouseEvent(WebPointerProperties::PointerType::Mouse, 0, m_expectedMouseId, true);
+    createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart+6, true);
+    createAndCheckTouchEvent(WebPointerProperties::PointerType::Pen, 0, m_mappedIdStart+7, true);
+}
+
+TEST_F(PointerEventFactoryTest, PenAsTouchAndMouseEvent)
+{
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent1 = createAndCheckMouseEvent(WebPointerProperties::PointerType::Pen, 0, m_mappedIdStart, true);
+    createAndCheckMouseEvent(WebPointerProperties::PointerType::Pen, 1, m_mappedIdStart+1, false);
+    createAndCheckMouseEvent(WebPointerProperties::PointerType::Pen, 2, m_mappedIdStart+2, false);
+    createAndCheckMouseEvent(WebPointerProperties::PointerType::Pen, 0, m_mappedIdStart, true);
+    createAndCheckMouseEvent(WebPointerProperties::PointerType::Pen, 1, m_mappedIdStart+1, false);
+    createAndCheckTouchEvent(WebPointerProperties::PointerType::Pen, 0, m_mappedIdStart, true);
+    createAndCheckTouchEvent(WebPointerProperties::PointerType::Pen, 1, m_mappedIdStart+1, false);
+
+    m_pointerEventFactory.remove(pointerEvent1);
+
+    createAndCheckTouchEvent(WebPointerProperties::PointerType::Pen, 0, m_mappedIdStart+3, false);
+    createAndCheckMouseEvent(WebPointerProperties::PointerType::Pen, 0, m_mappedIdStart+3, false);
+
+    m_pointerEventFactory.clear();
+
+    createAndCheckTouchEvent(WebPointerProperties::PointerType::Pen, 1, m_mappedIdStart+4, true);
+    createAndCheckTouchEvent(WebPointerProperties::PointerType::Pen, 0, m_mappedIdStart+5, false);
+    createAndCheckMouseEvent(WebPointerProperties::PointerType::Pen, 1, m_mappedIdStart+4, true);
+    createAndCheckMouseEvent(WebPointerProperties::PointerType::Pen, 0, m_mappedIdStart+5, false);
+}
+
+
+TEST_F(PointerEventFactoryTest, OutOfRange)
+{
+    RefPtrWillBeRawPtr<PointerEvent> pointerEvent1 = createAndCheckMouseEvent(WebPointerProperties::PointerType::Unknown, 0, m_mappedIdStart, true);
+    createAndCheckMouseEvent(WebPointerProperties::PointerType::Unknown, 1, m_mappedIdStart+1, false);
+    createAndCheckMouseEvent(WebPointerProperties::PointerType::Unknown, 2, m_mappedIdStart+2, false);
+    createAndCheckTouchEvent(WebPointerProperties::PointerType::Unknown, 0, m_mappedIdStart, true);
+    createAndCheckTouchEvent(WebPointerProperties::PointerType::Unknown, 3, m_mappedIdStart+3, false);
+    createAndCheckMouseEvent(WebPointerProperties::PointerType::Unknown, 2, m_mappedIdStart+2, false);
+
+    m_pointerEventFactory.remove(pointerEvent1);
+
+    createAndCheckTouchEvent(WebPointerProperties::PointerType::Unknown, 0, m_mappedIdStart+4, false);
+    createAndCheckTouchEvent(WebPointerProperties::PointerType::Unknown, INT_MAX, m_mappedIdStart+5, false);
+
+    m_pointerEventFactory.clear();
+
+    for (int i = 0; i < 100; ++i) {
+        createAndCheckMouseEvent(WebPointerProperties::PointerType::Touch, i, m_mappedIdStart+6+i, i == 0);
+    }
+
+    for (int i = 0; i < 100; ++i) {
+        createAndCheckTouchEvent(WebPointerProperties::PointerType::Mouse, i, m_expectedMouseId, true);
+    }
+}
+
+} // namespace blink