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

Unified Diff: third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp

Issue 2573073003: Collapse the API surface on WebInputEvent via accessor functions. (Closed)
Patch Set: Fix nits Created 3 years, 11 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
Index: third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp b/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
index 8cfba8bcf8e7ac0b7394beeb6a79d49ce8856b6e..54c6c7d18c4086d82308aac69e7372510d1879b0 100644
--- a/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp
@@ -66,7 +66,7 @@ KeyboardEvent* createKeyboardEventWithLocation(
int getModifiersForKeyLocationCode(KeyboardEvent::KeyLocationCode location) {
KeyboardEvent* event = createKeyboardEventWithLocation(location);
WebKeyboardEventBuilder convertedEvent(*event);
- return convertedEvent.modifiers;
+ return convertedEvent.modifiers();
}
TEST(WebInputEventConversionTest, WebKeyboardEventBuilder) {
@@ -99,7 +99,7 @@ TEST(WebInputEventConversionTest, WebKeyboardEventBuilder) {
TEST(WebInputEventConversionTest, WebMouseEventBuilder) {
TouchEvent* event = TouchEvent::create();
WebMouseEventBuilder mouse(0, 0, *event);
- EXPECT_EQ(WebInputEvent::Undefined, mouse.type);
+ EXPECT_EQ(WebInputEvent::Undefined, mouse.type());
}
TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
@@ -154,7 +154,7 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
ASSERT_EQ(1u, webTouchBuilder.touchesLength);
- EXPECT_EQ(WebInputEvent::TouchStart, webTouchBuilder.type);
+ EXPECT_EQ(WebInputEvent::TouchStart, webTouchBuilder.type());
EXPECT_EQ(WebTouchPoint::StatePressed, webTouchBuilder.touches[0].state);
EXPECT_FLOAT_EQ(p0.screenPosition.x,
webTouchBuilder.touches[0].screenPosition.x);
@@ -199,7 +199,7 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
ASSERT_EQ(2u, webTouchBuilder.touchesLength);
- EXPECT_EQ(WebInputEvent::TouchMove, webTouchBuilder.type);
+ EXPECT_EQ(WebInputEvent::TouchMove, webTouchBuilder.type());
EXPECT_EQ(WebTouchPoint::StateMoved, webTouchBuilder.touches[0].state);
EXPECT_EQ(WebTouchPoint::StateStationary, webTouchBuilder.touches[1].state);
EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
@@ -222,7 +222,7 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
ASSERT_EQ(2u, webTouchBuilder.touchesLength);
- EXPECT_EQ(WebInputEvent::TouchMove, webTouchBuilder.type);
+ EXPECT_EQ(WebInputEvent::TouchMove, webTouchBuilder.type());
EXPECT_EQ(WebTouchPoint::StateStationary, webTouchBuilder.touches[0].state);
EXPECT_EQ(WebTouchPoint::StateMoved, webTouchBuilder.touches[1].state);
EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
@@ -244,7 +244,7 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
ASSERT_EQ(2u, webTouchBuilder.touchesLength);
- EXPECT_EQ(WebInputEvent::TouchEnd, webTouchBuilder.type);
+ EXPECT_EQ(WebInputEvent::TouchEnd, webTouchBuilder.type());
EXPECT_EQ(WebTouchPoint::StateStationary, webTouchBuilder.touches[0].state);
EXPECT_EQ(WebTouchPoint::StateReleased, webTouchBuilder.touches[1].state);
EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
@@ -266,7 +266,7 @@ TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
ASSERT_EQ(2u, webTouchBuilder.touchesLength);
- EXPECT_EQ(WebInputEvent::TouchCancel, webTouchBuilder.type);
+ EXPECT_EQ(WebInputEvent::TouchCancel, webTouchBuilder.type());
EXPECT_EQ(WebTouchPoint::StateCancelled, webTouchBuilder.touches[0].state);
EXPECT_EQ(WebTouchPoint::StateCancelled, webTouchBuilder.touches[1].state);
EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
« no previous file with comments | « third_party/WebKit/Source/web/tests/WebFrameTest.cpp ('k') | third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698