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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_win.cc

Issue 10816008: ash: Record some additional information about the gestures. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_win.h ('k') | ui/aura/event.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_host_view_win.h" 5 #include "content/browser/renderer_host/render_widget_host_view_win.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <peninputpanel_i.c> 9 #include <peninputpanel_i.c>
10 #include <stack> 10 #include <stack>
(...skipping 1264 matching lines...) Expand 10 before | Expand all | Expand 10 after
1275 // events, and otherwise to unregister. 1275 // events, and otherwise to unregister.
1276 if (touch_mode) { 1276 if (touch_mode) {
1277 touch_mode = SetToTouchMode(); 1277 touch_mode = SetToTouchMode();
1278 } 1278 }
1279 if (!touch_mode) { 1279 if (!touch_mode) {
1280 SetToGestureMode(); 1280 SetToGestureMode();
1281 } 1281 }
1282 } 1282 }
1283 1283
1284 ui::GestureEvent* RenderWidgetHostViewWin::CreateGestureEvent( 1284 ui::GestureEvent* RenderWidgetHostViewWin::CreateGestureEvent(
1285 ui::EventType type, 1285 const ui::GestureEventDetails& details,
1286 const gfx::Point& location, 1286 const gfx::Point& location,
1287 int flags, 1287 int flags,
1288 base::Time time, 1288 base::Time time,
1289 float param_first,
1290 float param_second,
1291 unsigned int touch_id_bitfield) { 1289 unsigned int touch_id_bitfield) {
1292 1290
1293 return new LocalGestureEvent(m_hWnd, type, location, flags, time, 1291 return new LocalGestureEvent(m_hWnd, details.type(), location, flags, time,
1294 param_first, param_second, touch_id_bitfield); 1292 details.generic_x(), details.generic_y(), touch_id_bitfield);
1295 } 1293 }
1296 1294
1297 ui::TouchEvent* RenderWidgetHostViewWin::CreateTouchEvent( 1295 ui::TouchEvent* RenderWidgetHostViewWin::CreateTouchEvent(
1298 ui::EventType type, 1296 ui::EventType type,
1299 const gfx::Point& location, 1297 const gfx::Point& location,
1300 int touch_id, 1298 int touch_id,
1301 base::TimeDelta time_stamp) { 1299 base::TimeDelta time_stamp) {
1302 return new LocalTouchEvent(type, location, touch_id, time_stamp); 1300 return new LocalTouchEvent(type, location, touch_id, time_stamp);
1303 } 1301 }
1304 1302
(...skipping 1852 matching lines...) Expand 10 before | Expand all | Expand 10 after
3157 // receive a focus change in the context of a pointer down message, it means 3155 // receive a focus change in the context of a pointer down message, it means
3158 // that the pointer down message occurred on the edit field and we should 3156 // that the pointer down message occurred on the edit field and we should
3159 // display the on screen keyboard 3157 // display the on screen keyboard
3160 if (!received_focus_change_after_pointer_down_ && virtual_keyboard_) 3158 if (!received_focus_change_after_pointer_down_ && virtual_keyboard_)
3161 DisplayOnScreenKeyboardIfNeeded(); 3159 DisplayOnScreenKeyboardIfNeeded();
3162 received_focus_change_after_pointer_down_ = false; 3160 received_focus_change_after_pointer_down_ = false;
3163 pointer_down_context_ = false; 3161 pointer_down_context_ = false;
3164 } 3162 }
3165 3163
3166 } // namespace content 3164 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_win.h ('k') | ui/aura/event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698