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/renderer/render_widget.h" | 5 #include "content/renderer/render_widget.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 1152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1163 // send us the same kind of event we are delaying the ack for. | 1163 // send us the same kind of event we are delaying the ack for. |
1164 Send(pending_input_event_ack_.release()); | 1164 Send(pending_input_event_ack_.release()); |
1165 } | 1165 } |
1166 pending_input_event_ack_.reset(response); | 1166 pending_input_event_ack_.reset(response); |
1167 if (compositor_) | 1167 if (compositor_) |
1168 compositor_->NotifyInputThrottledUntilCommit(); | 1168 compositor_->NotifyInputThrottledUntilCommit(); |
1169 } else { | 1169 } else { |
1170 Send(response); | 1170 Send(response); |
1171 } | 1171 } |
1172 | 1172 |
1173 #if defined(OS_ANDROID) | |
1174 // Allow the IME to be shown when the focus changes as a consequence | |
1175 // of a processed touch end event. | |
1176 if (input_event->type == WebInputEvent::TouchEnd && processed) | |
1177 UpdateTextInputState(true, true); | |
1178 #endif | |
1179 | |
1180 handling_input_event_ = false; | 1173 handling_input_event_ = false; |
1181 | 1174 |
1182 if (!prevent_default) { | 1175 if (!prevent_default) { |
1183 if (WebInputEvent::isKeyboardEventType(input_event->type)) | 1176 if (WebInputEvent::isKeyboardEventType(input_event->type)) |
1184 DidHandleKeyEvent(); | 1177 DidHandleKeyEvent(); |
1185 if (WebInputEvent::isMouseEventType(input_event->type)) | 1178 if (WebInputEvent::isMouseEventType(input_event->type)) |
1186 DidHandleMouseEvent(*(static_cast<const WebMouseEvent*>(input_event))); | 1179 DidHandleMouseEvent(*(static_cast<const WebMouseEvent*>(input_event))); |
1187 if (WebInputEvent::isTouchEventType(input_event->type)) | 1180 if (WebInputEvent::isTouchEventType(input_event->type)) |
1188 DidHandleTouchEvent(*(static_cast<const WebTouchEvent*>(input_event))); | 1181 DidHandleTouchEvent(*(static_cast<const WebTouchEvent*>(input_event))); |
1189 } | 1182 } |
(...skipping 1627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2817 GetURLForGraphicsContext3D(), | 2810 GetURLForGraphicsContext3D(), |
2818 gpu_channel_host.get(), | 2811 gpu_channel_host.get(), |
2819 use_echo_for_swap_ack, | 2812 use_echo_for_swap_ack, |
2820 attributes, | 2813 attributes, |
2821 false /* bind generates resources */, | 2814 false /* bind generates resources */, |
2822 limits)); | 2815 limits)); |
2823 return context.Pass(); | 2816 return context.Pass(); |
2824 } | 2817 } |
2825 | 2818 |
2826 } // namespace content | 2819 } // namespace content |
OLD | NEW |