summaryrefslogtreecommitdiffstats
path: root/ui/events/gesture_event_details.h
diff options
context:
space:
mode:
authortdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-28 12:19:28 +0000
committertdresser@chromium.org <tdresser@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-28 12:19:28 +0000
commit0ac602ec3efd260ee3de805ff9c382cd2dea85b1 (patch)
tree68b84cf8e956fe25448db0f11e6bb73618bb5667 /ui/events/gesture_event_details.h
parent243c2111f4feaa6d4acf092d6562b6ef4b177624 (diff)
downloadchromium_src-0ac602ec3efd260ee3de805ff9c382cd2dea85b1.zip
chromium_src-0ac602ec3efd260ee3de805ff9c382cd2dea85b1.tar.gz
chromium_src-0ac602ec3efd260ee3de805ff9c382cd2dea85b1.tar.bz2
Remove unclamped delta and velocity values from GestureEventDetails.
Turns out the "ordinal" values in GestureEventDetails are never used. This patch replaces https://codereview.chromium.org/256593003/. BUG=332418 Review URL: https://codereview.chromium.org/258803002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266517 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/events/gesture_event_details.h')
-rw-r--r--ui/events/gesture_event_details.h28
1 files changed, 0 insertions, 28 deletions
diff --git a/ui/events/gesture_event_details.h b/ui/events/gesture_event_details.h
index 17c73ac..fb897b2 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