| 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 <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 2087 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2098 } | 2098 } |
| 2099 } | 2099 } |
| 2100 #endif | 2100 #endif |
| 2101 | 2101 |
| 2102 void RenderWidget::didHandleGestureEvent( | 2102 void RenderWidget::didHandleGestureEvent( |
| 2103 const WebGestureEvent& event, | 2103 const WebGestureEvent& event, |
| 2104 bool event_cancelled) { | 2104 bool event_cancelled) { |
| 2105 #if defined(OS_ANDROID) || defined(USE_AURA) | 2105 #if defined(OS_ANDROID) || defined(USE_AURA) |
| 2106 if (event_cancelled) | 2106 if (event_cancelled) |
| 2107 return; | 2107 return; |
| 2108 if (event.type == WebInputEvent::GestureTap) { | 2108 if (event.type() == WebInputEvent::GestureTap) { |
| 2109 UpdateTextInputState(ShowIme::IF_NEEDED, ChangeSource::FROM_NON_IME); | 2109 UpdateTextInputState(ShowIme::IF_NEEDED, ChangeSource::FROM_NON_IME); |
| 2110 } else if (event.type == WebInputEvent::GestureLongPress) { | 2110 } else if (event.type() == WebInputEvent::GestureLongPress) { |
| 2111 DCHECK(GetWebWidget()); | 2111 DCHECK(GetWebWidget()); |
| 2112 if (GetWebWidget()->textInputInfo().value.isEmpty()) | 2112 if (GetWebWidget()->textInputInfo().value.isEmpty()) |
| 2113 UpdateTextInputState(ShowIme::HIDE_IME, ChangeSource::FROM_NON_IME); | 2113 UpdateTextInputState(ShowIme::HIDE_IME, ChangeSource::FROM_NON_IME); |
| 2114 else | 2114 else |
| 2115 UpdateTextInputState(ShowIme::IF_NEEDED, ChangeSource::FROM_NON_IME); | 2115 UpdateTextInputState(ShowIme::IF_NEEDED, ChangeSource::FROM_NON_IME); |
| 2116 } | 2116 } |
| 2117 #endif | 2117 #endif |
| 2118 } | 2118 } |
| 2119 | 2119 |
| 2120 void RenderWidget::didOverscroll( | 2120 void RenderWidget::didOverscroll( |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2240 // browser side (https://crbug.com/669219). | 2240 // browser side (https://crbug.com/669219). |
| 2241 // If there is no WebFrameWidget, then there will be no | 2241 // If there is no WebFrameWidget, then there will be no |
| 2242 // InputMethodControllers for a WebLocalFrame. | 2242 // InputMethodControllers for a WebLocalFrame. |
| 2243 return nullptr; | 2243 return nullptr; |
| 2244 } | 2244 } |
| 2245 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) | 2245 return static_cast<blink::WebFrameWidget*>(GetWebWidget()) |
| 2246 ->getActiveWebInputMethodController(); | 2246 ->getActiveWebInputMethodController(); |
| 2247 } | 2247 } |
| 2248 | 2248 |
| 2249 } // namespace content | 2249 } // namespace content |
| OLD | NEW |