| 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 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 370 case ui::ET_GESTURE_DOUBLE_TAP: | 370 case ui::ET_GESTURE_DOUBLE_TAP: |
| 371 return WebKit::WebGestureEvent::GestureDoubleTap; | 371 return WebKit::WebGestureEvent::GestureDoubleTap; |
| 372 case ui::ET_GESTURE_LONG_PRESS: | 372 case ui::ET_GESTURE_LONG_PRESS: |
| 373 return WebKit::WebGestureEvent::GestureLongPress; | 373 return WebKit::WebGestureEvent::GestureLongPress; |
| 374 case ui::ET_GESTURE_PINCH_BEGIN: | 374 case ui::ET_GESTURE_PINCH_BEGIN: |
| 375 return WebKit::WebGestureEvent::GesturePinchBegin; | 375 return WebKit::WebGestureEvent::GesturePinchBegin; |
| 376 case ui::ET_GESTURE_PINCH_END: | 376 case ui::ET_GESTURE_PINCH_END: |
| 377 return WebKit::WebGestureEvent::GesturePinchEnd; | 377 return WebKit::WebGestureEvent::GesturePinchEnd; |
| 378 case ui::ET_GESTURE_PINCH_UPDATE: | 378 case ui::ET_GESTURE_PINCH_UPDATE: |
| 379 return WebKit::WebGestureEvent::GesturePinchUpdate; | 379 return WebKit::WebGestureEvent::GesturePinchUpdate; |
| 380 case ui::ET_GESTURE_TAP_UP: | 380 case ui::ET_GESTURE_BEGIN: |
| 381 return WebKit::WebGestureEvent::Undefined; |
| 382 case ui::ET_GESTURE_END: |
| 381 return WebKit::WebGestureEvent::Undefined; | 383 return WebKit::WebGestureEvent::Undefined; |
| 382 case ui::ET_GESTURE_MULTIFINGER_SWIPE: | 384 case ui::ET_GESTURE_MULTIFINGER_SWIPE: |
| 383 return WebKit::WebGestureEvent::Undefined; | 385 return WebKit::WebGestureEvent::Undefined; |
| 384 case ui::ET_GESTURE_TWO_FINGER_TAP: | 386 case ui::ET_GESTURE_TWO_FINGER_TAP: |
| 385 return WebKit::WebGestureEvent::Undefined; | 387 return WebKit::WebGestureEvent::Undefined; |
| 386 case ui::ET_TOUCH_PRESSED: | 388 case ui::ET_TOUCH_PRESSED: |
| 387 return WebKit::WebInputEvent::TouchStart; | 389 return WebKit::WebInputEvent::TouchStart; |
| 388 case ui::ET_TOUCH_MOVED: | 390 case ui::ET_TOUCH_MOVED: |
| 389 case ui::ET_TOUCH_STATIONARY: | 391 case ui::ET_TOUCH_STATIONARY: |
| 390 return WebKit::WebInputEvent::TouchMove; | 392 return WebKit::WebInputEvent::TouchMove; |
| (...skipping 2631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3022 void RenderWidgetHostViewWin::ResetPointerDownContext() { | 3024 void RenderWidgetHostViewWin::ResetPointerDownContext() { |
| 3023 // If the default focus on the page is on an edit field and we did not | 3025 // If the default focus on the page is on an edit field and we did not |
| 3024 // receive a focus change in the context of a pointer down message, it means | 3026 // receive a focus change in the context of a pointer down message, it means |
| 3025 // that the pointer down message occurred on the edit field and we should | 3027 // that the pointer down message occurred on the edit field and we should |
| 3026 // display the on screen keyboard | 3028 // display the on screen keyboard |
| 3027 if (!received_focus_change_after_pointer_down_ && virtual_keyboard_) | 3029 if (!received_focus_change_after_pointer_down_ && virtual_keyboard_) |
| 3028 DisplayOnScreenKeyboardIfNeeded(); | 3030 DisplayOnScreenKeyboardIfNeeded(); |
| 3029 received_focus_change_after_pointer_down_ = false; | 3031 received_focus_change_after_pointer_down_ = false; |
| 3030 pointer_down_context_ = false; | 3032 pointer_down_context_ = false; |
| 3031 } | 3033 } |
| OLD | NEW |