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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1852663002: Oilpan: Remove WillBe types (part 9) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « third_party/WebKit/Source/core/events/PointerEventFactory.cpp ('k') | third_party/WebKit/Source/core/events/PopStateEvent.h » ('j') | no next file with comments »
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..48339d735d7e81612eec2ad16c971882afc3617f 100644
--- a/third_party/WebKit/Source/core/events/PointerEventFactoryTest.cpp
+++ b/third_party/WebKit/Source/core/events/PointerEventFactoryTest.cpp
@@ -15,20 +15,20 @@ namespace blink {
class PointerEventFactoryTest : public ::testing::Test {
protected:
void SetUp() override;
- PassRefPtrWillBeRawPtr<PointerEvent> createAndCheckTouchCancel(
+ RawPtr<PointerEvent> createAndCheckTouchCancel(
WebPointerProperties::PointerType, int rawId,
int uniqueId, bool isPrimary,
PlatformTouchPoint::TouchState = PlatformTouchPoint::TouchReleased);
- PassRefPtrWillBeRawPtr<PointerEvent> createAndCheckTouchEvent(
+ RawPtr<PointerEvent> createAndCheckTouchEvent(
WebPointerProperties::PointerType, int rawId,
int uniqueId, bool isPrimary,
PlatformTouchPoint::TouchState = PlatformTouchPoint::TouchPressed);
- PassRefPtrWillBeRawPtr<PointerEvent> createAndCheckMouseEvent(
+ RawPtr<PointerEvent> createAndCheckMouseEvent(
WebPointerProperties::PointerType, int rawId,
int uniqueId, bool isPrimary,
PlatformEvent::Modifiers = PlatformEvent::NoModifiers);
void createAndCheckPointerTransitionEvent(
- PassRefPtrWillBeRawPtr<PointerEvent>,
+ RawPtr<PointerEvent>,
const AtomicString&);
PointerEventFactory m_pointerEventFactory;
@@ -73,12 +73,12 @@ PointerEventFactoryTest::PlatformMouseEventBuilder::PlatformMouseEventBuilder(
m_modifiers = modifiers;
}
-PassRefPtrWillBeRawPtr<PointerEvent> PointerEventFactoryTest::createAndCheckTouchCancel(
+RawPtr<PointerEvent> PointerEventFactoryTest::createAndCheckTouchCancel(
WebPointerProperties::PointerType pointerType, int rawId,
int uniqueId, bool isPrimary,
PlatformTouchPoint::TouchState state)
{
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent = m_pointerEventFactory.createPointerCancelEvent(
+ RawPtr<PointerEvent> pointerEvent = m_pointerEventFactory.createPointerCancelEvent(
PointerEventFactoryTest::PlatformTouchPointBuilder(pointerType, rawId, state));
EXPECT_EQ(uniqueId, pointerEvent->pointerId());
EXPECT_EQ(isPrimary, pointerEvent->isPrimary());
@@ -86,11 +86,11 @@ PassRefPtrWillBeRawPtr<PointerEvent> PointerEventFactoryTest::createAndCheckTouc
}
void PointerEventFactoryTest::createAndCheckPointerTransitionEvent(
- PassRefPtrWillBeRawPtr<PointerEvent> prpPointerEvent,
+ RawPtr<PointerEvent> prpPointerEvent,
const AtomicString& type)
{
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent = prpPointerEvent;
- RefPtrWillBeRawPtr<PointerEvent> clonePointerEvent = m_pointerEventFactory.
+ RawPtr<PointerEvent> pointerEvent = prpPointerEvent;
+ RawPtr<PointerEvent> clonePointerEvent = m_pointerEventFactory.
createPointerTransitionEvent(pointerEvent, type, nullptr);
EXPECT_EQ(clonePointerEvent->pointerType(), pointerEvent->pointerType());
EXPECT_EQ(clonePointerEvent->pointerId(), pointerEvent->pointerId());
@@ -98,24 +98,24 @@ void PointerEventFactoryTest::createAndCheckPointerTransitionEvent(
EXPECT_EQ(clonePointerEvent->type(), type);
}
-PassRefPtrWillBeRawPtr<PointerEvent> PointerEventFactoryTest::createAndCheckTouchEvent(
+RawPtr<PointerEvent> PointerEventFactoryTest::createAndCheckTouchEvent(
WebPointerProperties::PointerType pointerType,
int rawId, int uniqueId, bool isPrimary,
PlatformTouchPoint::TouchState state)
{
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent = m_pointerEventFactory.create(
+ RawPtr<PointerEvent> pointerEvent = m_pointerEventFactory.create(
EventTypeNames::pointerdown, PointerEventFactoryTest::PlatformTouchPointBuilder(pointerType, rawId, state), PlatformEvent::NoModifiers, 0, 0, 0, 0);
EXPECT_EQ(uniqueId, pointerEvent->pointerId());
EXPECT_EQ(isPrimary, pointerEvent->isPrimary());
return pointerEvent;
}
-PassRefPtrWillBeRawPtr<PointerEvent> PointerEventFactoryTest::createAndCheckMouseEvent(
+RawPtr<PointerEvent> PointerEventFactoryTest::createAndCheckMouseEvent(
WebPointerProperties::PointerType pointerType,
int rawId, int uniqueId, bool isPrimary,
PlatformEvent::Modifiers modifiers)
{
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent = m_pointerEventFactory.create(
+ RawPtr<PointerEvent> pointerEvent = m_pointerEventFactory.create(
EventTypeNames::mouseenter, PlatformMouseEventBuilder(pointerType, rawId, modifiers), nullptr, nullptr);
EXPECT_EQ(uniqueId, pointerEvent->pointerId());
EXPECT_EQ(isPrimary, pointerEvent->isPrimary());
@@ -127,8 +127,8 @@ TEST_F(PointerEventFactoryTest, MousePointer)
EXPECT_TRUE(m_pointerEventFactory.isActive(m_expectedMouseId));
EXPECT_FALSE(m_pointerEventFactory.isActiveButtonsState(m_expectedMouseId));
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent1 = createAndCheckMouseEvent(WebPointerProperties::PointerType::Mouse, 0, m_expectedMouseId, true);
- RefPtrWillBeRawPtr<PointerEvent> pointerEvent2 = createAndCheckMouseEvent(WebPointerProperties::PointerType::Mouse, 0, m_expectedMouseId, true, PlatformEvent::LeftButtonDown);
+ RawPtr<PointerEvent> pointerEvent1 = createAndCheckMouseEvent(WebPointerProperties::PointerType::Mouse, 0, m_expectedMouseId, true);
+ RawPtr<PointerEvent> pointerEvent2 = createAndCheckMouseEvent(WebPointerProperties::PointerType::Mouse, 0, m_expectedMouseId, true, PlatformEvent::LeftButtonDown);
createAndCheckPointerTransitionEvent(pointerEvent1, EventTypeNames::pointerout);
@@ -155,7 +155,7 @@ TEST_F(PointerEventFactoryTest, MousePointer)
TEST_F(PointerEventFactoryTest, 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_pointerEventFactory.remove(pointerEvent1);
@@ -171,8 +171,8 @@ TEST_F(PointerEventFactoryTest, TouchPointerReleasedAndPressedAgain)
EXPECT_FALSE(m_pointerEventFactory.isActiveButtonsState(m_mappedIdStart));
EXPECT_FALSE(m_pointerEventFactory.isActiveButtonsState(m_mappedIdStart+1));
- 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);
createAndCheckPointerTransitionEvent(pointerEvent1, EventTypeNames::pointerleave);
createAndCheckPointerTransitionEvent(pointerEvent2, EventTypeNames::pointerenter);
@@ -203,8 +203,8 @@ TEST_F(PointerEventFactoryTest, TouchAndDrag)
EXPECT_FALSE(m_pointerEventFactory.isActive(m_mappedIdStart));
EXPECT_FALSE(m_pointerEventFactory.isActiveButtonsState(m_mappedIdStart));
- 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);
EXPECT_TRUE(m_pointerEventFactory.isActive(m_mappedIdStart));
EXPECT_TRUE(m_pointerEventFactory.isActiveButtonsState(m_mappedIdStart));
@@ -248,11 +248,11 @@ TEST_F(PointerEventFactoryTest, TouchAndDrag)
TEST_F(PointerEventFactoryTest, 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);
@@ -271,7 +271,7 @@ TEST_F(PointerEventFactoryTest, MouseAndTouchAndPen)
TEST_F(PointerEventFactoryTest, 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);
@@ -298,7 +298,7 @@ TEST_F(PointerEventFactoryTest, PenAsTouchAndMouseEvent)
TEST_F(PointerEventFactoryTest, 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);
« no previous file with comments | « third_party/WebKit/Source/core/events/PointerEventFactory.cpp ('k') | third_party/WebKit/Source/core/events/PopStateEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698