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

Unified Diff: ui/events/gesture_detection/motion_event.cc

Issue 494833003: Completed webkit radiusX, radiusY and rotationAngle handling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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: ui/events/gesture_detection/motion_event.cc
diff --git a/ui/events/gesture_detection/motion_event.cc b/ui/events/gesture_detection/motion_event.cc
index d3646cc4f9bd0a00698bd75b0382792af376184a..19404cdca72360cbc5dd9d93d8e240dd546c5a95 100644
--- a/ui/events/gesture_detection/motion_event.cc
+++ b/ui/events/gesture_detection/motion_event.cc
@@ -24,6 +24,18 @@ float MotionEvent::GetHistoricalTouchMajor(size_t pointer_index,
return 0.f;
}
+float MotionEvent::GetHistoricalTouchMinor(size_t pointer_index,
+ size_t historical_index) const {
+ NOTIMPLEMENTED();
+ return 0.f;
+}
+
+float MotionEvent::GetHistoricalOrientation(size_t pointer_index,
+ size_t historical_index) const {
+ NOTIMPLEMENTED();
+ return 0.f;
+}
+
float MotionEvent::GetHistoricalX(size_t pointer_index,
size_t historical_index) const {
NOTIMPLEMENTED();
@@ -63,6 +75,8 @@ bool operator==(const MotionEvent& lhs, const MotionEvent& rhs) {
lhs.GetRawX(i) != rhs.GetRawX(rhsi) ||
lhs.GetRawY(i) != rhs.GetRawY(rhsi) ||
lhs.GetTouchMajor(i) != rhs.GetTouchMajor(rhsi) ||
+ lhs.GetTouchMinor(i) != rhs.GetTouchMinor(rhsi) ||
+ lhs.GetOrientation(i) != rhs.GetOrientation(rhsi) ||
lhs.GetPressure(i) != rhs.GetPressure(rhsi) ||
lhs.GetToolType(i) != rhs.GetToolType(rhsi))
return false;
@@ -71,7 +85,11 @@ bool operator==(const MotionEvent& lhs, const MotionEvent& rhs) {
if (lhs.GetHistoricalX(i, h) != rhs.GetHistoricalX(rhsi, h) ||
lhs.GetHistoricalY(i, h) != rhs.GetHistoricalY(rhsi, h) ||
lhs.GetHistoricalTouchMajor(i, h) !=
- rhs.GetHistoricalTouchMajor(rhsi, h))
+ rhs.GetHistoricalTouchMajor(rhsi, h) ||
+ lhs.GetHistoricalTouchMinor(i, h) !=
+ rhs.GetHistoricalTouchMinor(rhsi, h) ||
+ lhs.GetHistoricalOrientation(i, h) !=
+ rhs.GetHistoricalOrientation(rhsi, h))
return false;
}
}

Powered by Google App Engine
This is Rietveld 408576698