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

Unified Diff: ui/events/gesture_event_details.h

Issue 258803002: Remove unclamped delta and velocity values from GestureEventDetails. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | « ui/aura/gestures/gesture_recognizer_unittest.cc ('k') | ui/events/gesture_event_details.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/gesture_event_details.h
diff --git a/ui/events/gesture_event_details.h b/ui/events/gesture_event_details.h
index 17c73acc6a5cdb35b5766bbcad62745b4f75d28a..fb897b2fce308bf0b2154080df1a7921daff79f7 100644
--- a/ui/events/gesture_event_details.h
+++ b/ui/events/gesture_event_details.h
@@ -17,9 +17,6 @@ struct EVENTS_BASE_EXPORT GestureEventDetails {
public:
GestureEventDetails();
GestureEventDetails(EventType type, float delta_x, float delta_y);
- GestureEventDetails(EventType type,
- float delta_x, float delta_y,
- float delta_x_ordinal, float delta_y_ordinal);
EventType type() const { return type_; }
@@ -67,27 +64,6 @@ struct EVENTS_BASE_EXPORT GestureEventDetails {
return data.fling_velocity.y;
}
- // *_ordinal values are unmodified by rail based clamping.
- float scroll_x_ordinal() const {
- DCHECK_EQ(ui::ET_GESTURE_SCROLL_UPDATE, type_);
- return data.scroll_update.x_ordinal;
- }
-
- float scroll_y_ordinal() const {
- DCHECK_EQ(ui::ET_GESTURE_SCROLL_UPDATE, type_);
- return data.scroll_update.y_ordinal;
- }
-
- float velocity_x_ordinal() const {
- DCHECK(type_ == ui::ET_SCROLL_FLING_START);
- return data.fling_velocity.x_ordinal;
- }
-
- float velocity_y_ordinal() const {
- DCHECK(type_ == ui::ET_SCROLL_FLING_START);
- return data.fling_velocity.y_ordinal;
- }
-
float first_finger_width() const {
DCHECK_EQ(ui::ET_GESTURE_TWO_FINGER_TAP, type_);
return data.first_finger_enclosing_rectangle.width;
@@ -144,8 +120,6 @@ struct EVENTS_BASE_EXPORT GestureEventDetails {
struct { // SCROLL delta.
float x;
float y;
- float x_ordinal;
- float y_ordinal;
} scroll_update;
float scale; // PINCH scale.
@@ -153,8 +127,6 @@ struct EVENTS_BASE_EXPORT GestureEventDetails {
struct { // FLING velocity.
float x;
float y;
- float x_ordinal;
- float y_ordinal;
} fling_velocity;
// Dimensions of the first finger's enclosing rectangle for
« no previous file with comments | « ui/aura/gestures/gesture_recognizer_unittest.cc ('k') | ui/events/gesture_event_details.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698