Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(361)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/events/PointerEventFactoryTest.cpp

Issue 1800143002: Notify Blink about start of gesture scroll through a queued event. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed touch_event_stream_validator Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« third_party/WebKit/Source/core/events/PointerEventFactory.cpp ('K') | « third_party/WebKit/Source/core/events/PointerEventFactory.cpp ('k') | third_party/WebKit/Source/core/input/EventHandler.h » ('j') | third_party/WebKit/Source/core/input/EventHandler.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
index bb94a43fbd139d454c4dd35f6cee05b0d020b806..f8f99048f9d9294ab181147edf439fd7d6a39b33 100644
--- a/third_party/WebKit/Source/core/events/PointerEventFactoryTest.cpp
+++ b/third_party/WebKit/Source/core/events/PointerEventFactoryTest.cpp
@@ -17,8 +17,7 @@ protected:
void SetUp() override;
PassRefPtrWillBeRawPtr<PointerEvent> createAndCheckTouchCancel(
WebPointerProperties::PointerType, int rawId,
- int uniqueId, bool isPrimary,
- PlatformTouchPoint::TouchState = PlatformTouchPoint::TouchReleased);
+ int uniqueId, bool isPrimary);
PassRefPtrWillBeRawPtr<PointerEvent> createAndCheckTouchEvent(
WebPointerProperties::PointerType, int rawId,
int uniqueId, bool isPrimary,
@@ -75,11 +74,10 @@ PointerEventFactoryTest::PlatformMouseEventBuilder::PlatformMouseEventBuilder(
PassRefPtrWillBeRawPtr<PointerEvent> PointerEventFactoryTest::createAndCheckTouchCancel(
WebPointerProperties::PointerType pointerType, int rawId,
- int uniqueId, bool isPrimary,
- PlatformTouchPoint::TouchState state)
+ int uniqueId, bool isPrimary)
{
RefPtrWillBeRawPtr<PointerEvent> pointerEvent = m_pointerEventFactory.createPointerCancelEvent(
- PointerEventFactoryTest::PlatformTouchPointBuilder(pointerType, rawId, state));
+ uniqueId, pointerType);
EXPECT_EQ(uniqueId, pointerEvent->pointerId());
EXPECT_EQ(isPrimary, pointerEvent->isPrimary());
return pointerEvent;
@@ -135,7 +133,7 @@ TEST_F(PointerEventFactoryTest, MousePointer)
EXPECT_TRUE(m_pointerEventFactory.isActive(m_expectedMouseId));
EXPECT_TRUE(m_pointerEventFactory.isActiveButtonsState(m_expectedMouseId));
- m_pointerEventFactory.remove(pointerEvent1);
+ m_pointerEventFactory.remove(pointerEvent1->pointerId());
EXPECT_TRUE(m_pointerEventFactory.isActive(m_expectedMouseId));
EXPECT_TRUE(m_pointerEventFactory.isActiveButtonsState(m_expectedMouseId));
@@ -145,8 +143,8 @@ TEST_F(PointerEventFactoryTest, MousePointer)
EXPECT_TRUE(m_pointerEventFactory.isActive(m_expectedMouseId));
EXPECT_FALSE(m_pointerEventFactory.isActiveButtonsState(m_expectedMouseId));
- m_pointerEventFactory.remove(pointerEvent1);
- m_pointerEventFactory.remove(pointerEvent2);
+ m_pointerEventFactory.remove(pointerEvent1->pointerId());
+ m_pointerEventFactory.remove(pointerEvent2->pointerId());
createAndCheckMouseEvent(WebPointerProperties::PointerType::Mouse, 1, m_expectedMouseId, true);
createAndCheckMouseEvent(WebPointerProperties::PointerType::Mouse, 20, m_expectedMouseId, true);
@@ -158,7 +156,7 @@ TEST_F(PointerEventFactoryTest, TouchPointerPrimaryRemovedWhileAnotherIsThere)
RefPtrWillBeRawPtr<PointerEvent> pointerEvent1 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 1, m_mappedIdStart+1, false);
- m_pointerEventFactory.remove(pointerEvent1);
+ m_pointerEventFactory.remove(pointerEvent1->pointerId());
createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 2, m_mappedIdStart+2, false);
createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 1, m_mappedIdStart+1, false);
@@ -182,8 +180,8 @@ TEST_F(PointerEventFactoryTest, TouchPointerReleasedAndPressedAgain)
EXPECT_TRUE(m_pointerEventFactory.isActiveButtonsState(m_mappedIdStart));
EXPECT_TRUE(m_pointerEventFactory.isActiveButtonsState(m_mappedIdStart+1));
- m_pointerEventFactory.remove(pointerEvent1);
- m_pointerEventFactory.remove(pointerEvent2);
+ m_pointerEventFactory.remove(pointerEvent1->pointerId());
+ m_pointerEventFactory.remove(pointerEvent2->pointerId());
EXPECT_FALSE(m_pointerEventFactory.isActive(m_mappedIdStart));
EXPECT_FALSE(m_pointerEventFactory.isActive(m_mappedIdStart+1));
@@ -214,8 +212,8 @@ TEST_F(PointerEventFactoryTest, TouchAndDrag)
EXPECT_TRUE(m_pointerEventFactory.isActive(m_mappedIdStart));
EXPECT_FALSE(m_pointerEventFactory.isActiveButtonsState(m_mappedIdStart));
- m_pointerEventFactory.remove(pointerEvent1);
- m_pointerEventFactory.remove(pointerEvent2);
+ m_pointerEventFactory.remove(pointerEvent1->pointerId());
+ m_pointerEventFactory.remove(pointerEvent2->pointerId());
EXPECT_FALSE(m_pointerEventFactory.isActive(m_mappedIdStart));
EXPECT_FALSE(m_pointerEventFactory.isActiveButtonsState(m_mappedIdStart));
@@ -228,7 +226,7 @@ TEST_F(PointerEventFactoryTest, TouchAndDrag)
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);
+ m_pointerEventFactory.remove(pointerEvent1->pointerId());
EXPECT_TRUE(m_pointerEventFactory.isActive(m_mappedIdStart+1));
EXPECT_TRUE(m_pointerEventFactory.isActiveButtonsState(m_mappedIdStart+1));
@@ -256,9 +254,9 @@ TEST_F(PointerEventFactoryTest, MouseAndTouchAndPen)
createAndCheckTouchEvent(WebPointerProperties::PointerType::Pen, 0, m_mappedIdStart+1, true);
createAndCheckTouchEvent(WebPointerProperties::PointerType::Pen, 47213, m_mappedIdStart+4, false);
- m_pointerEventFactory.remove(pointerEvent1);
- m_pointerEventFactory.remove(pointerEvent2);
- m_pointerEventFactory.remove(pointerEvent3);
+ m_pointerEventFactory.remove(pointerEvent1->pointerId());
+ m_pointerEventFactory.remove(pointerEvent2->pointerId());
+ m_pointerEventFactory.remove(pointerEvent3->pointerId());
createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 100, m_mappedIdStart+5, true);
@@ -279,7 +277,7 @@ TEST_F(PointerEventFactoryTest, PenAsTouchAndMouseEvent)
createAndCheckTouchEvent(WebPointerProperties::PointerType::Pen, 0, m_mappedIdStart, true);
createAndCheckTouchEvent(WebPointerProperties::PointerType::Pen, 1, m_mappedIdStart+1, false);
- m_pointerEventFactory.remove(pointerEvent1);
+ m_pointerEventFactory.remove(pointerEvent1->pointerId());
createAndCheckTouchEvent(WebPointerProperties::PointerType::Pen, 0, m_mappedIdStart+3, false);
createAndCheckMouseEvent(WebPointerProperties::PointerType::Pen, 0, m_mappedIdStart+3, false);
@@ -306,7 +304,7 @@ TEST_F(PointerEventFactoryTest, OutOfRange)
createAndCheckMouseEvent(WebPointerProperties::PointerType::Unknown, 2, m_mappedIdStart+2, false);
createAndCheckTouchCancel(WebPointerProperties::PointerType::Unknown, 3, m_mappedIdStart+3, false);
- m_pointerEventFactory.remove(pointerEvent1);
+ m_pointerEventFactory.remove(pointerEvent1->pointerId());
createAndCheckTouchEvent(WebPointerProperties::PointerType::Unknown, 0, m_mappedIdStart+4, false);
createAndCheckTouchEvent(WebPointerProperties::PointerType::Unknown, INT_MAX, m_mappedIdStart+5, false);
« third_party/WebKit/Source/core/events/PointerEventFactory.cpp ('K') | « third_party/WebKit/Source/core/events/PointerEventFactory.cpp ('k') | third_party/WebKit/Source/core/input/EventHandler.h » ('j') | third_party/WebKit/Source/core/input/EventHandler.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698