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

Unified Diff: content/renderer/pepper/event_conversion_unittest.cc

Issue 1218663006: Use new WebTouchPoint field names. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 | « content/renderer/pepper/event_conversion.cc ('k') | ui/events/blink/blink_event_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/event_conversion_unittest.cc
diff --git a/content/renderer/pepper/event_conversion_unittest.cc b/content/renderer/pepper/event_conversion_unittest.cc
index 8a22a939e8da459ab08932d8fdaa8fd40cef6f75..8f2cb74347ef2ecdc8e1631939377b869c5a5e29 100644
--- a/content/renderer/pepper/event_conversion_unittest.cc
+++ b/content/renderer/pepper/event_conversion_unittest.cc
@@ -20,19 +20,19 @@ class EventConversionTest : public ::testing::Test {
for (size_t i = 0; i < expected.touchesLength; ++i) {
size_t j = 0;
for (; j < actual.touchesLength; ++j) {
- if (actual.touches[j].id == expected.touches[i].id)
+ if (actual.touches[j].pointerId == expected.touches[i].pointerId)
break;
}
ASSERT_NE(j, actual.touchesLength);
- EXPECT_EQ(expected.touches[i].id, actual.touches[j].id);
+ EXPECT_EQ(expected.touches[i].pointerId, actual.touches[j].pointerId);
EXPECT_EQ(expected.touches[i].state, actual.touches[j].state);
EXPECT_EQ(expected.touches[i].position.x, actual.touches[j].position.x);
EXPECT_EQ(expected.touches[i].position.y, actual.touches[j].position.y);
- EXPECT_EQ(expected.touches[i].radiusX, actual.touches[j].radiusX);
- EXPECT_EQ(expected.touches[i].radiusY, actual.touches[j].radiusY);
+ EXPECT_EQ(expected.touches[i].width, actual.touches[j].width);
+ EXPECT_EQ(expected.touches[i].height, actual.touches[j].height);
EXPECT_EQ(expected.touches[i].rotationAngle,
actual.touches[j].rotationAngle);
- EXPECT_EQ(expected.touches[i].force, actual.touches[j].force);
+ EXPECT_EQ(expected.touches[i].pressure, actual.touches[j].pressure);
}
}
};
« no previous file with comments | « content/renderer/pepper/event_conversion.cc ('k') | ui/events/blink/blink_event_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698