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

Unified Diff: ui/base/events/event.h

Issue 12208118: Add support for ordinal scroll amounts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix interactive_ui_tests failure Created 7 years, 10 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/test/event_generator.cc ('k') | ui/base/events/event.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/events/event.h
diff --git a/ui/base/events/event.h b/ui/base/events/event.h
index b691118c064954ffd7b74149ad0541340fdaec1a..91a1ac897d28bb7b315a2eb7fe62c80d9de8b9fa 100644
--- a/ui/base/events/event.h
+++ b/ui/base/events/event.h
@@ -622,6 +622,8 @@ class UI_EXPORT ScrollEvent : public MouseEvent {
: MouseEvent(model, source, target),
x_offset_(model.x_offset_),
y_offset_(model.y_offset_),
+ x_offset_ordinal_(model.x_offset_ordinal_),
+ y_offset_ordinal_(model.y_offset_ordinal_),
finger_count_(model.finger_count_){
}
@@ -632,6 +634,8 @@ class UI_EXPORT ScrollEvent : public MouseEvent {
int flags,
float x_offset,
float y_offset,
+ float x_offset_ordinal,
+ float y_offset_ordinal,
int finger_count);
// Scale the scroll event's offset value.
@@ -641,11 +645,18 @@ class UI_EXPORT ScrollEvent : public MouseEvent {
float x_offset() const { return x_offset_; }
float y_offset() const { return y_offset_; }
+ float x_offset_ordinal() const { return x_offset_ordinal_; }
+ float y_offset_ordinal() const { return y_offset_ordinal_; }
int finger_count() const { return finger_count_; }
private:
+ // Potential accelerated offsets.
float x_offset_;
float y_offset_;
+ // Unaccelerated offsets.
+ float x_offset_ordinal_;
+ float y_offset_ordinal_;
+ // Number of fingers on the pad.
int finger_count_;
};
« no previous file with comments | « ui/aura/test/event_generator.cc ('k') | ui/base/events/event.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698