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

Unified Diff: views/events/event.cc

Issue 7129008: Update rich touch information to conform to standard (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: addressing sky's comments Created 9 years, 6 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 | « views/events/event.h ('k') | views/events/event_x.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/events/event.cc
diff --git a/views/events/event.cc b/views/events/event.cc
index 86166b72f81b48fc811b606f9645796b1209d1d9..8ec7ea8d9e1ccc465052dcb26c4071c63af60214 100644
--- a/views/events/event.cc
+++ b/views/events/event.cc
@@ -185,22 +185,22 @@ TouchEvent::TouchEvent(ui::EventType type,
int y,
int flags,
int touch_id,
- float radius,
- float angle,
- float ratio)
+ float radius_x,
+ float radius_y,
+ float angle)
: LocatedEvent(type, gfx::Point(x, y), flags),
touch_id_(touch_id),
- radius_(radius),
- angle_(angle),
- ratio_(ratio) {
+ radius_x_(radius_x),
+ radius_y_(radius_y),
+ angle_(angle) {
}
TouchEvent::TouchEvent(const TouchEvent& model, View* source, View* target)
: LocatedEvent(model, source, target),
touch_id_(model.touch_id_),
- radius_(model.radius_),
- angle_(model.angle_),
- ratio_(model.ratio_) {
+ radius_x_(model.radius_x_),
+ radius_y_(model.radius_y_),
+ angle_(model.angle_) {
}
////////////////////////////////////////////////////////////////////////////////
@@ -209,9 +209,9 @@ TouchEvent::TouchEvent(const TouchEvent& model, View* source, View* target)
TouchEvent::TouchEvent(const TouchEvent& model, View* root)
: LocatedEvent(model, root),
touch_id_(model.touch_id_),
- radius_(model.radius_),
- angle_(model.angle_),
- ratio_(model.ratio_) {
+ radius_x_(model.radius_x_),
+ radius_y_(model.radius_y_),
+ angle_(model.angle_) {
}
#endif
« no previous file with comments | « views/events/event.h ('k') | views/events/event_x.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698