| OLD | NEW |
| 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 <peninputpanel_i.c> | 8 #include <peninputpanel_i.c> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 case ui::ET_GESTURE_DOUBLE_TAP: | 371 case ui::ET_GESTURE_DOUBLE_TAP: |
| 372 return WebKit::WebGestureEvent::GestureDoubleTap; | 372 return WebKit::WebGestureEvent::GestureDoubleTap; |
| 373 case ui::ET_GESTURE_LONG_PRESS: | 373 case ui::ET_GESTURE_LONG_PRESS: |
| 374 return WebKit::WebGestureEvent::GestureLongPress; | 374 return WebKit::WebGestureEvent::GestureLongPress; |
| 375 case ui::ET_GESTURE_PINCH_BEGIN: | 375 case ui::ET_GESTURE_PINCH_BEGIN: |
| 376 return WebKit::WebGestureEvent::GesturePinchBegin; | 376 return WebKit::WebGestureEvent::GesturePinchBegin; |
| 377 case ui::ET_GESTURE_PINCH_END: | 377 case ui::ET_GESTURE_PINCH_END: |
| 378 return WebKit::WebGestureEvent::GesturePinchEnd; | 378 return WebKit::WebGestureEvent::GesturePinchEnd; |
| 379 case ui::ET_GESTURE_PINCH_UPDATE: | 379 case ui::ET_GESTURE_PINCH_UPDATE: |
| 380 return WebKit::WebGestureEvent::GesturePinchUpdate; | 380 return WebKit::WebGestureEvent::GesturePinchUpdate; |
| 381 case ui::ET_GESTURE_BEGIN: | 381 case ui::ET_GESTURE_TAP_UP: |
| 382 return WebKit::WebGestureEvent::Undefined; | |
| 383 case ui::ET_GESTURE_END: | |
| 384 return WebKit::WebGestureEvent::Undefined; | 382 return WebKit::WebGestureEvent::Undefined; |
| 385 case ui::ET_GESTURE_MULTIFINGER_SWIPE: | 383 case ui::ET_GESTURE_MULTIFINGER_SWIPE: |
| 386 return WebKit::WebGestureEvent::Undefined; | 384 return WebKit::WebGestureEvent::Undefined; |
| 387 case ui::ET_GESTURE_TWO_FINGER_TAP: | 385 case ui::ET_GESTURE_TWO_FINGER_TAP: |
| 388 return WebKit::WebGestureEvent::Undefined; | 386 return WebKit::WebGestureEvent::Undefined; |
| 389 case ui::ET_TOUCH_PRESSED: | 387 case ui::ET_TOUCH_PRESSED: |
| 390 return WebKit::WebInputEvent::TouchStart; | 388 return WebKit::WebInputEvent::TouchStart; |
| 391 case ui::ET_TOUCH_MOVED: | 389 case ui::ET_TOUCH_MOVED: |
| 392 case ui::ET_TOUCH_STATIONARY: | 390 case ui::ET_TOUCH_STATIONARY: |
| 393 return WebKit::WebInputEvent::TouchMove; | 391 return WebKit::WebInputEvent::TouchMove; |
| (...skipping 2644 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3038 void RenderWidgetHostViewWin::ResetPointerDownContext() { | 3036 void RenderWidgetHostViewWin::ResetPointerDownContext() { |
| 3039 // If the default focus on the page is on an edit field and we did not | 3037 // If the default focus on the page is on an edit field and we did not |
| 3040 // receive a focus change in the context of a pointer down message, it means | 3038 // receive a focus change in the context of a pointer down message, it means |
| 3041 // that the pointer down message occurred on the edit field and we should | 3039 // that the pointer down message occurred on the edit field and we should |
| 3042 // display the on screen keyboard | 3040 // display the on screen keyboard |
| 3043 if (!received_focus_change_after_pointer_down_ && virtual_keyboard_) | 3041 if (!received_focus_change_after_pointer_down_ && virtual_keyboard_) |
| 3044 DisplayOnScreenKeyboardIfNeeded(); | 3042 DisplayOnScreenKeyboardIfNeeded(); |
| 3045 received_focus_change_after_pointer_down_ = false; | 3043 received_focus_change_after_pointer_down_ = false; |
| 3046 pointer_down_context_ = false; | 3044 pointer_down_context_ = false; |
| 3047 } | 3045 } |
| OLD | NEW |