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

Unified Diff: ui/events/blink/blink_event_util.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_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/blink/blink_event_util.cc
diff --git a/ui/events/blink/blink_event_util.cc b/ui/events/blink/blink_event_util.cc
index b389600f23b33709d46b444a4dcb420368403f6b..4973782cca69b9763a1cd4c034f7805e1abc4c00 100644
--- a/ui/events/blink/blink_event_util.cc
+++ b/ui/events/blink/blink_event_util.cc
@@ -74,7 +74,7 @@ WebTouchPoint::State ToWebTouchPointState(const MotionEvent& event,
WebTouchPoint CreateWebTouchPoint(const MotionEvent& event,
size_t pointer_index) {
WebTouchPoint touch;
- touch.id = event.GetPointerId(pointer_index);
+ touch.pointerId = event.GetPointerId(pointer_index);
touch.state = ToWebTouchPointState(event, pointer_index);
touch.position.x = event.GetX(pointer_index);
touch.position.y = event.GetY(pointer_index);
@@ -127,16 +127,16 @@ WebTouchPoint CreateWebTouchPoint(const MotionEvent& event,
// 'else' block is equivalent in this case, we want to pass the 0 value
// unchanged (and 0 is the default value for many devices that don't
// report elliptical touches).
- touch.radiusX = minor_radius;
- touch.radiusY = major_radius;
+ touch.width = minor_radius;
+ touch.height = major_radius;
touch.rotationAngle = orientation_deg;
} else {
- touch.radiusX = major_radius;
- touch.radiusY = minor_radius;
+ touch.width = major_radius;
+ touch.height = minor_radius;
touch.rotationAngle = orientation_deg + 90;
}
- touch.force = event.GetPressure(pointer_index);
+ touch.pressure = event.GetPressure(pointer_index);
return touch;
}
« no previous file with comments | « content/renderer/pepper/event_conversion_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698