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_impl.h" | 5 #include "content/browser/renderer_host/render_widget_host_impl.h" |
6 | 6 |
7 #include <math.h> | 7 #include <math.h> |
8 #include <set> | 8 #include <set> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 1127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1138 return; | 1138 return; |
1139 | 1139 |
1140 if (key_event.type == WebKeyboardEvent::RawKeyDown) | 1140 if (key_event.type == WebKeyboardEvent::RawKeyDown) |
1141 suppress_next_char_events_ = false; | 1141 suppress_next_char_events_ = false; |
1142 } | 1142 } |
1143 | 1143 |
1144 if (touch_emulator_ && touch_emulator_->HandleKeyboardEvent(key_event)) | 1144 if (touch_emulator_ && touch_emulator_->HandleKeyboardEvent(key_event)) |
1145 return; | 1145 return; |
1146 | 1146 |
1147 NativeWebKeyboardEventWithLatencyInfo key_event_with_latency(key_event); | 1147 NativeWebKeyboardEventWithLatencyInfo key_event_with_latency(key_event); |
| 1148 key_event_with_latency.event.isBrowserShortcut = is_shortcut; |
1148 latency_tracker_.OnInputEvent(key_event, &key_event_with_latency.latency); | 1149 latency_tracker_.OnInputEvent(key_event, &key_event_with_latency.latency); |
1149 input_router_->SendKeyboardEvent(key_event_with_latency, is_shortcut); | 1150 input_router_->SendKeyboardEvent(key_event_with_latency); |
1150 } | 1151 } |
1151 | 1152 |
1152 void RenderWidgetHostImpl::QueueSyntheticGesture( | 1153 void RenderWidgetHostImpl::QueueSyntheticGesture( |
1153 scoped_ptr<SyntheticGesture> synthetic_gesture, | 1154 scoped_ptr<SyntheticGesture> synthetic_gesture, |
1154 const base::Callback<void(SyntheticGesture::Result)>& on_complete) { | 1155 const base::Callback<void(SyntheticGesture::Result)>& on_complete) { |
1155 if (!synthetic_gesture_controller_ && view_) { | 1156 if (!synthetic_gesture_controller_ && view_) { |
1156 synthetic_gesture_controller_.reset( | 1157 synthetic_gesture_controller_.reset( |
1157 new SyntheticGestureController( | 1158 new SyntheticGestureController( |
1158 view_->CreateSyntheticGestureTarget().Pass())); | 1159 view_->CreateSyntheticGestureTarget().Pass())); |
1159 } | 1160 } |
(...skipping 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2193 } | 2194 } |
2194 | 2195 |
2195 #if defined(OS_WIN) | 2196 #if defined(OS_WIN) |
2196 gfx::NativeViewAccessible | 2197 gfx::NativeViewAccessible |
2197 RenderWidgetHostImpl::GetParentNativeViewAccessible() { | 2198 RenderWidgetHostImpl::GetParentNativeViewAccessible() { |
2198 return delegate_ ? delegate_->GetParentNativeViewAccessible() : NULL; | 2199 return delegate_ ? delegate_->GetParentNativeViewAccessible() : NULL; |
2199 } | 2200 } |
2200 #endif | 2201 #endif |
2201 | 2202 |
2202 } // namespace content | 2203 } // namespace content |
OLD | NEW |