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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/animation/CSSLengthInterpolationType.cpp ('K') | « third_party/WebKit/Source/core/events/PointerEventManager.cpp ('k') | third_party/WebKit/Source/core/events/PopStateEvent.h » ('j') | third_party/WebKit/Source/willbe.pl » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/events/PointerEventManagerTest.cpp
diff --git a/third_party/WebKit/Source/core/events/PointerEventManagerTest.cpp b/third_party/WebKit/Source/core/events/PointerEventManagerTest.cpp
index 359f84592713a393cd33f45f76431a2575054439..8d3096b3c78768e01ae64bff2da38e6f26593213 100644
--- a/third_party/WebKit/Source/core/events/PointerEventManagerTest.cpp
+++ b/third_party/WebKit/Source/core/events/PointerEventManagerTest.cpp
@@ -15,13 +15,13 @@ namespace blink {
class PointerEventManagerTest : public ::testing::Test {
protected:
void SetUp() override;
- PassRefPtrWillBeRawPtr<PointerEvent> createAndCheckTouchCancel(
+ RawPtr<PointerEvent> createAndCheckTouchCancel(
WebPointerProperties::PointerType, int rawId,
int uniqueId, bool isPrimary);
- PassRefPtrWillBeRawPtr<PointerEvent> createAndCheckTouchEvent(
+ RawPtr<PointerEvent> createAndCheckTouchEvent(
WebPointerProperties::PointerType, int rawId,
int uniqueId, bool isPrimary);
- PassRefPtrWillBeRawPtr<PointerEvent> createAndCheckMouseEvent(
+ RawPtr<PointerEvent> createAndCheckMouseEvent(
WebPointerProperties::PointerType, int rawId,
int uniqueId, bool isPrimary);
@@ -62,32 +62,32 @@ PointerEventManagerTest::PlatformMouseEventBuilder::PlatformMouseEventBuilder(
m_pointerProperties.id = id;
}
-PassRefPtrWillBeRawPtr<PointerEvent> PointerEventManagerTest::createAndCheckTouchCancel(
+RawPtr<PointerEvent> PointerEventManagerTest::createAndCheckTouchCancel(
WebPointerProperties::PointerType pointerType, int rawId,
int uniqueId, bool isPrimary)
{
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent = m_pointerEventManager.createPointerCancel(
+ RawPtr<PointerEvent> pointerEvent = m_pointerEventManager.createPointerCancel(
PointerEventManagerTest::PlatformTouchPointBuilder(pointerType, rawId));
EXPECT_EQ(uniqueId, pointerEvent->pointerId());
EXPECT_EQ(isPrimary, pointerEvent->isPrimary());
return pointerEvent;
}
-PassRefPtrWillBeRawPtr<PointerEvent> PointerEventManagerTest::createAndCheckTouchEvent(
+RawPtr<PointerEvent> PointerEventManagerTest::createAndCheckTouchEvent(
WebPointerProperties::PointerType pointerType, int rawId,
int uniqueId, bool isPrimary)
{
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent = m_pointerEventManager.create(
+ RawPtr<PointerEvent> pointerEvent = m_pointerEventManager.create(
EventTypeNames::pointerdown, PointerEventManagerTest::PlatformTouchPointBuilder(pointerType, rawId), PlatformEvent::NoModifiers, 0, 0, 0, 0);
EXPECT_EQ(uniqueId, pointerEvent->pointerId());
EXPECT_EQ(isPrimary, pointerEvent->isPrimary());
return pointerEvent;
}
-PassRefPtrWillBeRawPtr<PointerEvent> PointerEventManagerTest::createAndCheckMouseEvent(
+RawPtr<PointerEvent> PointerEventManagerTest::createAndCheckMouseEvent(
WebPointerProperties::PointerType pointerType, int rawId, int uniqueId, bool isPrimary)
{
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent = m_pointerEventManager.create(
+ RawPtr<PointerEvent> pointerEvent = m_pointerEventManager.create(
EventTypeNames::pointerenter, PlatformMouseEventBuilder(pointerType, rawId), nullptr, nullptr);
EXPECT_EQ(uniqueId, pointerEvent->pointerId());
EXPECT_EQ(isPrimary, pointerEvent->isPrimary());
@@ -96,8 +96,8 @@ PassRefPtrWillBeRawPtr<PointerEvent> PointerEventManagerTest::createAndCheckMous
TEST_F(PointerEventManagerTest, MousePointer)
{
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent1 = createAndCheckMouseEvent(WebPointerProperties::PointerType::Mouse, 0, m_expectedMouseId, true);
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent2 = createAndCheckMouseEvent(WebPointerProperties::PointerType::Mouse, 0, m_expectedMouseId, true);
+ RawPtr<PointerEvent> pointerEvent1 = createAndCheckMouseEvent(WebPointerProperties::PointerType::Mouse, 0, m_expectedMouseId, true);
+ RawPtr<PointerEvent> pointerEvent2 = createAndCheckMouseEvent(WebPointerProperties::PointerType::Mouse, 0, m_expectedMouseId, true);
m_pointerEventManager.remove(pointerEvent1);
@@ -112,7 +112,7 @@ TEST_F(PointerEventManagerTest, MousePointer)
TEST_F(PointerEventManagerTest, TouchPointerPrimaryRemovedWhileAnotherIsThere)
{
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent1 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
+ RawPtr<PointerEvent> pointerEvent1 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 1, m_mappedIdStart+1, false);
m_pointerEventManager.remove(pointerEvent1);
@@ -123,8 +123,8 @@ TEST_F(PointerEventManagerTest, TouchPointerPrimaryRemovedWhileAnotherIsThere)
TEST_F(PointerEventManagerTest, TouchPointerReleasedAndPressedAgain)
{
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent1 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent2 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 1, m_mappedIdStart+1, false);
+ RawPtr<PointerEvent> pointerEvent1 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
+ RawPtr<PointerEvent> pointerEvent2 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 1, m_mappedIdStart+1, false);
m_pointerEventManager.remove(pointerEvent1);
m_pointerEventManager.remove(pointerEvent2);
@@ -139,8 +139,8 @@ TEST_F(PointerEventManagerTest, TouchPointerReleasedAndPressedAgain)
TEST_F(PointerEventManagerTest, TouchAndDrag)
{
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent1 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent2 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
+ RawPtr<PointerEvent> pointerEvent1 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
+ RawPtr<PointerEvent> pointerEvent2 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
m_pointerEventManager.remove(pointerEvent1);
@@ -160,11 +160,11 @@ TEST_F(PointerEventManagerTest, TouchAndDrag)
TEST_F(PointerEventManagerTest, MouseAndTouchAndPen)
{
createAndCheckMouseEvent(WebPointerProperties::PointerType::Mouse, 0, m_expectedMouseId, true);
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent1 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
+ RawPtr<PointerEvent> pointerEvent1 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 0, m_mappedIdStart, true);
createAndCheckTouchEvent(WebPointerProperties::PointerType::Pen, 0, m_mappedIdStart+1, true);
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent2 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 1, m_mappedIdStart+2, false);
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent3 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 2, m_mappedIdStart+3, false);
+ RawPtr<PointerEvent> pointerEvent2 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 1, m_mappedIdStart+2, false);
+ RawPtr<PointerEvent> pointerEvent3 = createAndCheckTouchEvent(WebPointerProperties::PointerType::Touch, 2, m_mappedIdStart+3, false);
createAndCheckTouchEvent(WebPointerProperties::PointerType::Pen, 0, m_mappedIdStart+1, true);
createAndCheckTouchEvent(WebPointerProperties::PointerType::Pen, 47213, m_mappedIdStart+4, false);
@@ -183,7 +183,7 @@ TEST_F(PointerEventManagerTest, MouseAndTouchAndPen)
TEST_F(PointerEventManagerTest, PenAsTouchAndMouseEvent)
{
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent1 = createAndCheckMouseEvent(WebPointerProperties::PointerType::Pen, 0, m_mappedIdStart, true);
+ RawPtr<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);
@@ -210,7 +210,7 @@ TEST_F(PointerEventManagerTest, PenAsTouchAndMouseEvent)
TEST_F(PointerEventManagerTest, OutOfRange)
{
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent1 = createAndCheckMouseEvent(WebPointerProperties::PointerType::Unknown, 0, m_mappedIdStart, true);
+ RawPtr<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);
« third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp ('K') | « third_party/WebKit/Source/core/events/PointerEventManager.cpp ('k') | third_party/WebKit/Source/core/events/PopStateEvent.h » ('j') | third_party/WebKit/Source/willbe.pl » ('J')

Powered by Google App Engine
This is Rietveld 408576698