From 8efb575144aac6f5746aa9b2dba159ae5eb55ee1 Mon Sep 17 00:00:00 2001 From: "davemoore@chromium.org" Date: Thu, 29 Nov 2012 17:07:39 +0000 Subject: Support 3f swipe for tab scrubbing Tests will be added if we like approach and take out from behind flag. BUG=124830 TEST=None Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=170138 Review URL: https://codereview.chromium.org/11411247 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170208 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/base/events/event.cc | 2 +- ui/base/events/event.h | 5 ++++- ui/base/events/event_utils.h | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'ui/base/events') diff --git a/ui/base/events/event.cc b/ui/base/events/event.cc index 53cae8f..7fcdd90 100644 --- a/ui/base/events/event.cc +++ b/ui/base/events/event.cc @@ -505,7 +505,7 @@ DropTargetEvent::DropTargetEvent(const OSExchangeData& data, ScrollEvent::ScrollEvent(const base::NativeEvent& native_event) : MouseEvent(native_event) { if (type() == ET_SCROLL) { - GetScrollOffsets(native_event, &x_offset_, &y_offset_); + GetScrollOffsets(native_event, &x_offset_, &y_offset_, &finger_count_); double start, end; GetGestureTimes(native_event, &start, &end); } else if (type() == ET_SCROLL_FLING_START) { diff --git a/ui/base/events/event.h b/ui/base/events/event.h index 4f73146..7d74fba 100644 --- a/ui/base/events/event.h +++ b/ui/base/events/event.h @@ -581,7 +581,8 @@ class UI_EXPORT ScrollEvent : public MouseEvent { int flags) : MouseEvent(model, source, target, type, flags), x_offset_(model.x_offset_), - y_offset_(model.y_offset_) { + y_offset_(model.y_offset_), + finger_count_(model.finger_count_){ } // Used for tests. @@ -593,10 +594,12 @@ class UI_EXPORT ScrollEvent : public MouseEvent { float x_offset() const { return x_offset_; } float y_offset() const { return y_offset_; } + int finger_count() const { return finger_count_; } private: float x_offset_; float y_offset_; + int finger_count_; DISALLOW_COPY_AND_ASSIGN(ScrollEvent); }; diff --git a/ui/base/events/event_utils.h b/ui/base/events/event_utils.h index 1e1240e..77e542f 100644 --- a/ui/base/events/event_utils.h +++ b/ui/base/events/event_utils.h @@ -92,10 +92,11 @@ UI_EXPORT bool GetFlingData(const base::NativeEvent& native_event, bool* is_cancel); // Returns whether this is a scroll event and optionally gets the amount to be -// scrolled. |x_offset| and |y_offset| can be NULL. +// scrolled. |x_offset|, |y_offset| and |finger_count| can be NULL. UI_EXPORT bool GetScrollOffsets(const base::NativeEvent& native_event, float* x_offset, - float* y_offset); + float* y_offset, + int* finger_count); UI_EXPORT bool GetGestureTimes(const base::NativeEvent& native_event, double* start_time, -- cgit v1.1