diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 15:45:51 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 15:45:51 +0000 |
| commit | 2b1615d3e6c6b13573a031f6310c58d4b47cc950 (patch) | |
| tree | 438a1d41deb6bac516c8dd9d921896591f04d898 /content | |
| parent | 411fd60c54f40bcc4ee167b714dea449c64ec1e5 (diff) | |
| download | chromium_src-2b1615d3e6c6b13573a031f6310c58d4b47cc950.zip chromium_src-2b1615d3e6c6b13573a031f6310c58d4b47cc950.tar.gz chromium_src-2b1615d3e6c6b13573a031f6310c58d4b47cc950.tar.bz2 | |
ash: Record some additional information about the gestures.
Notable changes:
* Expose GestureEventDetails::touch_points for all kinds of gestures (instead of just BEGIN/END). This makes it possible to count when 3-finger swipes vs 4/4-finger swipes separately.
* Instead of using poorly-defined param_first/param_second when constructing a GestureEvent, use better-defined GestureEventDetails.
BUG=121179
TEST=covered by existing tests
Review URL: https://chromiumcodereview.appspot.com/10816008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_win.cc | 8 | ||||
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_win.h | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc index aee00ae..d6dcddd 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -1282,16 +1282,14 @@ void RenderWidgetHostViewWin::UpdateDesiredTouchMode(bool touch_mode) { } ui::GestureEvent* RenderWidgetHostViewWin::CreateGestureEvent( - ui::EventType type, + const ui::GestureEventDetails& details, const gfx::Point& location, int flags, base::Time time, - float param_first, - float param_second, unsigned int touch_id_bitfield) { - return new LocalGestureEvent(m_hWnd, type, location, flags, time, - param_first, param_second, touch_id_bitfield); + return new LocalGestureEvent(m_hWnd, details.type(), location, flags, time, + details.generic_x(), details.generic_y(), touch_id_bitfield); } ui::TouchEvent* RenderWidgetHostViewWin::CreateTouchEvent( diff --git a/content/browser/renderer_host/render_widget_host_view_win.h b/content/browser/renderer_host/render_widget_host_view_win.h index d402bee..c382e7c 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.h +++ b/content/browser/renderer_host/render_widget_host_view_win.h @@ -234,12 +234,10 @@ class RenderWidgetHostViewWin // Overridden from ui::GestureEventHelper. virtual ui::GestureEvent* CreateGestureEvent( - ui::EventType type, + const ui::GestureEventDetails& details, const gfx::Point& location, int flags, base::Time time, - float param_first, - float param_second, unsigned int touch_id_bitfield) OVERRIDE; virtual ui::TouchEvent* CreateTouchEvent( ui::EventType type, |