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

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

Issue 10895024: Use new gesture event fields in more places (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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
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 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 break; 411 break;
412 case ui::ET_GESTURE_PINCH_UPDATE: 412 case ui::ET_GESTURE_PINCH_UPDATE:
413 gesture_event.data.pinchUpdate.scale = gesture.details().scale(); 413 gesture_event.data.pinchUpdate.scale = gesture.details().scale();
414 gesture_event.deltaX = gesture.details().scale(); 414 gesture_event.deltaX = gesture.details().scale();
415 break; 415 break;
416 case ui::ET_SCROLL_FLING_START: 416 case ui::ET_SCROLL_FLING_START:
417 gesture_event.data.flingStart.velocityX = gesture.details().velocity_x(); 417 gesture_event.data.flingStart.velocityX = gesture.details().velocity_x();
418 gesture_event.data.flingStart.velocityY = gesture.details().velocity_y(); 418 gesture_event.data.flingStart.velocityY = gesture.details().velocity_y();
419 gesture_event.deltaX = gesture.details().velocity_x(); 419 gesture_event.deltaX = gesture.details().velocity_x();
420 gesture_event.deltaY = gesture.details().velocity_y(); 420 gesture_event.deltaY = gesture.details().velocity_y();
421 break;
rjkroege 2012/08/31 00:39:35 good catch.
421 case ui::ET_GESTURE_LONG_PRESS: 422 case ui::ET_GESTURE_LONG_PRESS:
422 gesture_event.type = WebKit::WebInputEvent::GestureLongPress;
rjkroege 2012/08/31 00:39:35 this looks sketchy.
Rick Byers 2012/08/31 14:49:29 This was redundant - set above. But I ended up br
423 gesture_event.data.longPress.width = 423 gesture_event.data.longPress.width =
424 gesture.details().bounding_box().width(); 424 gesture.details().bounding_box().width();
425 gesture_event.data.longPress.height = 425 gesture_event.data.longPress.height =
426 gesture.details().bounding_box().height(); 426 gesture.details().bounding_box().height();
427 break; 427 break;
428 default: 428 default:
429 break; 429 break;
430 } 430 }
431 return gesture_event; 431 return gesture_event;
432 } 432 }
(...skipping 2645 matching lines...) Expand 10 before | Expand all | Expand 10 after
3078 // receive a focus change in the context of a pointer down message, it means 3078 // receive a focus change in the context of a pointer down message, it means
3079 // that the pointer down message occurred on the edit field and we should 3079 // that the pointer down message occurred on the edit field and we should
3080 // display the on screen keyboard 3080 // display the on screen keyboard
3081 if (!received_focus_change_after_pointer_down_ && virtual_keyboard_) 3081 if (!received_focus_change_after_pointer_down_ && virtual_keyboard_)
3082 DisplayOnScreenKeyboardIfNeeded(); 3082 DisplayOnScreenKeyboardIfNeeded();
3083 received_focus_change_after_pointer_down_ = false; 3083 received_focus_change_after_pointer_down_ = false;
3084 pointer_down_context_ = false; 3084 pointer_down_context_ = false;
3085 } 3085 }
3086 3086
3087 } // namespace content 3087 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698