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/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 2027 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2038 UpdateCompositionInfo(true); | 2038 UpdateCompositionInfo(true); |
2039 #endif | 2039 #endif |
2040 } | 2040 } |
2041 | 2041 |
2042 void RenderWidget::didHandleGestureEvent( | 2042 void RenderWidget::didHandleGestureEvent( |
2043 const WebGestureEvent& event, | 2043 const WebGestureEvent& event, |
2044 bool event_cancelled) { | 2044 bool event_cancelled) { |
2045 #if defined(OS_ANDROID) || defined(USE_AURA) | 2045 #if defined(OS_ANDROID) || defined(USE_AURA) |
2046 if (event_cancelled) | 2046 if (event_cancelled) |
2047 return; | 2047 return; |
| 2048 ChangeSource curent_ime_status = |
| 2049 input_method_is_active_ ? FROM_IME : FROM_NON_IME; |
2048 if (event.type == WebInputEvent::GestureTap) { | 2050 if (event.type == WebInputEvent::GestureTap) { |
2049 UpdateTextInputState(SHOW_IME_IF_NEEDED, FROM_NON_IME); | 2051 UpdateTextInputState(SHOW_IME_IF_NEEDED, curent_ime_status); |
2050 } else if (event.type == WebInputEvent::GestureLongPress) { | 2052 } else if (event.type == WebInputEvent::GestureLongPress) { |
2051 DCHECK(webwidget_); | 2053 DCHECK(webwidget_); |
2052 if (webwidget_->textInputInfo().value.isEmpty()) | 2054 if (webwidget_->textInputInfo().value.isEmpty()) |
2053 UpdateTextInputState(NO_SHOW_IME, FROM_NON_IME); | 2055 UpdateTextInputState(NO_SHOW_IME, curent_ime_status); |
2054 else | 2056 else |
2055 UpdateTextInputState(SHOW_IME_IF_NEEDED, FROM_NON_IME); | 2057 UpdateTextInputState(SHOW_IME_IF_NEEDED, curent_ime_status); |
2056 } | 2058 } |
2057 #endif | 2059 #endif |
2058 } | 2060 } |
2059 | 2061 |
2060 void RenderWidget::StartCompositor() { | 2062 void RenderWidget::StartCompositor() { |
2061 // For widgets that are never visible, we don't need the compositor to run | 2063 // For widgets that are never visible, we don't need the compositor to run |
2062 // at all. | 2064 // at all. |
2063 if (never_visible_) | 2065 if (never_visible_) |
2064 return; | 2066 return; |
2065 compositor_->setSurfaceReady(); | 2067 compositor_->setSurfaceReady(); |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2239 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { | 2241 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { |
2240 video_hole_frames_.AddObserver(frame); | 2242 video_hole_frames_.AddObserver(frame); |
2241 } | 2243 } |
2242 | 2244 |
2243 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { | 2245 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { |
2244 video_hole_frames_.RemoveObserver(frame); | 2246 video_hole_frames_.RemoveObserver(frame); |
2245 } | 2247 } |
2246 #endif // defined(VIDEO_HOLE) | 2248 #endif // defined(VIDEO_HOLE) |
2247 | 2249 |
2248 } // namespace content | 2250 } // namespace content |
OLD | NEW |