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 1949 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1960 UpdateCompositionInfo(true); | 1960 UpdateCompositionInfo(true); |
1961 #endif | 1961 #endif |
1962 } | 1962 } |
1963 | 1963 |
1964 void RenderWidget::didHandleGestureEvent( | 1964 void RenderWidget::didHandleGestureEvent( |
1965 const WebGestureEvent& event, | 1965 const WebGestureEvent& event, |
1966 bool event_cancelled) { | 1966 bool event_cancelled) { |
1967 #if defined(OS_ANDROID) || defined(USE_AURA) | 1967 #if defined(OS_ANDROID) || defined(USE_AURA) |
1968 if (event_cancelled) | 1968 if (event_cancelled) |
1969 return; | 1969 return; |
1970 if (event.type == WebInputEvent::GestureTap || | 1970 if (event.type == WebInputEvent::GestureTap) { |
1971 event.type == WebInputEvent::GestureLongPress) { | |
1972 UpdateTextInputState(SHOW_IME_IF_NEEDED, FROM_NON_IME); | 1971 UpdateTextInputState(SHOW_IME_IF_NEEDED, FROM_NON_IME); |
| 1972 } else if (event.type == WebInputEvent::GestureLongPress) { |
| 1973 DCHECK(webwidget_); |
| 1974 if (webwidget_->textInputInfo().value.isEmpty()) |
| 1975 UpdateTextInputState(NO_SHOW_IME, FROM_NON_IME); |
| 1976 else |
| 1977 UpdateTextInputState(SHOW_IME_IF_NEEDED, FROM_NON_IME); |
1973 } | 1978 } |
1974 #endif | 1979 #endif |
1975 } | 1980 } |
1976 | 1981 |
1977 void RenderWidget::StartCompositor() { | 1982 void RenderWidget::StartCompositor() { |
1978 // For widgets that are never visible, we don't need the compositor to run | 1983 // For widgets that are never visible, we don't need the compositor to run |
1979 // at all. | 1984 // at all. |
1980 if (never_visible_) | 1985 if (never_visible_) |
1981 return; | 1986 return; |
1982 compositor_->setSurfaceReady(); | 1987 compositor_->setSurfaceReady(); |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2156 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { | 2161 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { |
2157 video_hole_frames_.AddObserver(frame); | 2162 video_hole_frames_.AddObserver(frame); |
2158 } | 2163 } |
2159 | 2164 |
2160 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { | 2165 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { |
2161 video_hole_frames_.RemoveObserver(frame); | 2166 video_hole_frames_.RemoveObserver(frame); |
2162 } | 2167 } |
2163 #endif // defined(VIDEO_HOLE) | 2168 #endif // defined(VIDEO_HOLE) |
2164 | 2169 |
2165 } // namespace content | 2170 } // namespace content |
OLD | NEW |