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/ime_adapter_android.h" | 5 #include "content/browser/renderer_host/ime_adapter_android.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <android/input.h> | 8 #include <android/input.h> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/android/jni_android.h" | 11 #include "base/android/jni_android.h" |
12 #include "base/android/jni_array.h" | 12 #include "base/android/jni_array.h" |
13 #include "base/android/jni_string.h" | 13 #include "base/android/jni_string.h" |
14 #include "base/android/scoped_java_ref.h" | 14 #include "base/android/scoped_java_ref.h" |
15 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
16 #include "base/time/time.h" | 16 #include "base/time/time.h" |
17 #include "content/browser/frame_host/frame_tree.h" | |
18 #include "content/browser/frame_host/frame_tree_node.h" | |
19 #include "content/browser/frame_host/render_frame_host_impl.h" | 17 #include "content/browser/frame_host/render_frame_host_impl.h" |
20 #include "content/browser/renderer_host/render_view_host_delegate.h" | 18 #include "content/browser/renderer_host/render_view_host_delegate.h" |
21 #include "content/browser/renderer_host/render_view_host_impl.h" | |
22 #include "content/browser/renderer_host/render_widget_host_impl.h" | 19 #include "content/browser/renderer_host/render_widget_host_impl.h" |
23 #include "content/browser/renderer_host/render_widget_host_view_android.h" | 20 #include "content/browser/renderer_host/render_widget_host_view_android.h" |
24 #include "content/common/input_messages.h" | 21 #include "content/common/input_messages.h" |
25 #include "content/common/view_messages.h" | 22 #include "content/common/view_messages.h" |
26 #include "content/public/browser/browser_thread.h" | 23 #include "content/public/browser/browser_thread.h" |
27 #include "content/public/browser/native_web_keyboard_event.h" | 24 #include "content/public/browser/native_web_keyboard_event.h" |
28 #include "content/public/browser/web_contents.h" | 25 #include "content/public/browser/web_contents.h" |
29 #include "jni/ImeAdapter_jni.h" | 26 #include "jni/ImeAdapter_jni.h" |
30 #include "third_party/WebKit/public/platform/WebInputEvent.h" | 27 #include "third_party/WebKit/public/platform/WebInputEvent.h" |
31 #include "third_party/WebKit/public/platform/WebTextInputType.h" | 28 #include "third_party/WebKit/public/platform/WebTextInputType.h" |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
103 underlines->push_back( | 100 underlines->push_back( |
104 blink::WebCompositionUnderline(static_cast<unsigned>(start), | 101 blink::WebCompositionUnderline(static_cast<unsigned>(start), |
105 static_cast<unsigned>(end), | 102 static_cast<unsigned>(end), |
106 SK_ColorBLACK, | 103 SK_ColorBLACK, |
107 false, | 104 false, |
108 SK_ColorTRANSPARENT)); | 105 SK_ColorTRANSPARENT)); |
109 } | 106 } |
110 | 107 |
111 ImeAdapterAndroid::ImeAdapterAndroid(RenderWidgetHostViewAndroid* rwhva) | 108 ImeAdapterAndroid::ImeAdapterAndroid(RenderWidgetHostViewAndroid* rwhva) |
112 : rwhva_(rwhva) { | 109 : rwhva_(rwhva) { |
110 DCHECK(rwhva_); | |
113 } | 111 } |
114 | 112 |
115 ImeAdapterAndroid::~ImeAdapterAndroid() { | 113 ImeAdapterAndroid::~ImeAdapterAndroid() { |
116 JNIEnv* env = AttachCurrentThread(); | 114 JNIEnv* env = AttachCurrentThread(); |
117 base::android::ScopedJavaLocalRef<jobject> obj = java_ime_adapter_.get(env); | 115 base::android::ScopedJavaLocalRef<jobject> obj = java_ime_adapter_.get(env); |
118 if (!obj.is_null()) | 116 if (!obj.is_null()) |
119 Java_ImeAdapter_detach(env, obj); | 117 Java_ImeAdapter_detach(env, obj); |
120 } | 118 } |
121 | 119 |
122 bool ImeAdapterAndroid::SendKeyEvent( | 120 bool ImeAdapterAndroid::SendKeyEvent( |
(...skipping 12 matching lines...) Expand all Loading... | |
135 time_ms / 1000.0, key_code, scan_code, is_system_key, unicode_char); | 133 time_ms / 1000.0, key_code, scan_code, is_system_key, unicode_char); |
136 rwhva_->SendKeyEvent(event); | 134 rwhva_->SendKeyEvent(event); |
137 return true; | 135 return true; |
138 } | 136 } |
139 | 137 |
140 void ImeAdapterAndroid::SetComposingText(JNIEnv* env, | 138 void ImeAdapterAndroid::SetComposingText(JNIEnv* env, |
141 const JavaParamRef<jobject>& obj, | 139 const JavaParamRef<jobject>& obj, |
142 const JavaParamRef<jobject>& text, | 140 const JavaParamRef<jobject>& text, |
143 const JavaParamRef<jstring>& text_str, | 141 const JavaParamRef<jstring>& text_str, |
144 int relative_cursor_pos) { | 142 int relative_cursor_pos) { |
145 RenderWidgetHostImpl* rwhi = GetRenderWidgetHostImpl(); | 143 RenderWidgetHostImpl* rwhi = GetFocusedWidget(); |
146 if (!rwhi) | 144 if (!rwhi) |
147 return; | 145 return; |
148 | 146 |
149 base::string16 text16 = ConvertJavaStringToUTF16(env, text_str); | 147 base::string16 text16 = ConvertJavaStringToUTF16(env, text_str); |
150 | 148 |
151 std::vector<blink::WebCompositionUnderline> underlines = | 149 std::vector<blink::WebCompositionUnderline> underlines = |
152 GetUnderlinesFromSpans(env, obj, text, text16); | 150 GetUnderlinesFromSpans(env, obj, text, text16); |
153 | 151 |
154 // Default to plain underline if we didn't find any span that we care about. | 152 // Default to plain underline if we didn't find any span that we care about. |
155 if (underlines.empty()) { | 153 if (underlines.empty()) { |
156 underlines.push_back(blink::WebCompositionUnderline( | 154 underlines.push_back(blink::WebCompositionUnderline( |
157 0, text16.length(), SK_ColorBLACK, false, SK_ColorTRANSPARENT)); | 155 0, text16.length(), SK_ColorBLACK, false, SK_ColorTRANSPARENT)); |
158 } | 156 } |
159 | 157 |
160 // relative_cursor_pos is as described in the Android API for | 158 // relative_cursor_pos is as described in the Android API for |
161 // InputConnection#setComposingText, whereas the parameters for | 159 // InputConnection#setComposingText, whereas the parameters for |
162 // ImeSetComposition are relative to the start of the composition. | 160 // ImeSetComposition are relative to the start of the composition. |
163 if (relative_cursor_pos > 0) | 161 if (relative_cursor_pos > 0) |
164 relative_cursor_pos = text16.length() + relative_cursor_pos - 1; | 162 relative_cursor_pos = text16.length() + relative_cursor_pos - 1; |
165 | 163 |
166 rwhi->ImeSetComposition(text16, underlines, gfx::Range::InvalidRange(), | 164 rwhi->ImeSetComposition(text16, underlines, gfx::Range::InvalidRange(), |
167 relative_cursor_pos, relative_cursor_pos); | 165 relative_cursor_pos, relative_cursor_pos); |
168 } | 166 } |
169 | 167 |
170 void ImeAdapterAndroid::CommitText(JNIEnv* env, | 168 void ImeAdapterAndroid::CommitText(JNIEnv* env, |
171 const JavaParamRef<jobject>& obj, | 169 const JavaParamRef<jobject>& obj, |
172 const JavaParamRef<jobject>& text, | 170 const JavaParamRef<jobject>& text, |
173 const JavaParamRef<jstring>& text_str, | 171 const JavaParamRef<jstring>& text_str, |
174 int relative_cursor_pos) { | 172 int relative_cursor_pos) { |
175 RenderWidgetHostImpl* rwhi = GetRenderWidgetHostImpl(); | 173 RenderWidgetHostImpl* rwhi = GetFocusedWidget(); |
176 if (!rwhi) | 174 if (!rwhi) |
177 return; | 175 return; |
178 | 176 |
179 base::string16 text16 = ConvertJavaStringToUTF16(env, text_str); | 177 base::string16 text16 = ConvertJavaStringToUTF16(env, text_str); |
180 | 178 |
181 std::vector<blink::WebCompositionUnderline> underlines = | 179 std::vector<blink::WebCompositionUnderline> underlines = |
182 GetUnderlinesFromSpans(env, obj, text, text16); | 180 GetUnderlinesFromSpans(env, obj, text, text16); |
183 | 181 |
184 // relative_cursor_pos is as described in the Android API for | 182 // relative_cursor_pos is as described in the Android API for |
185 // InputConnection#commitText, whereas the parameters for | 183 // InputConnection#commitText, whereas the parameters for |
186 // ImeConfirmComposition are relative to the end of the composition. | 184 // ImeConfirmComposition are relative to the end of the composition. |
187 if (relative_cursor_pos > 0) | 185 if (relative_cursor_pos > 0) |
188 relative_cursor_pos--; | 186 relative_cursor_pos--; |
189 else | 187 else |
190 relative_cursor_pos -= text16.length(); | 188 relative_cursor_pos -= text16.length(); |
191 | 189 |
192 rwhi->ImeCommitText(text16, underlines, gfx::Range::InvalidRange(), | 190 rwhi->ImeCommitText(text16, underlines, gfx::Range::InvalidRange(), |
193 relative_cursor_pos); | 191 relative_cursor_pos); |
194 } | 192 } |
195 | 193 |
196 void ImeAdapterAndroid::FinishComposingText(JNIEnv* env, | 194 void ImeAdapterAndroid::FinishComposingText(JNIEnv* env, |
197 const JavaParamRef<jobject>&) { | 195 const JavaParamRef<jobject>&) { |
198 RenderWidgetHostImpl* rwhi = GetRenderWidgetHostImpl(); | 196 RenderWidgetHostImpl* rwhi = GetFocusedWidget(); |
199 if (!rwhi) | 197 if (!rwhi) |
200 return; | 198 return; |
201 | 199 |
202 rwhi->ImeFinishComposingText(true); | 200 rwhi->ImeFinishComposingText(true); |
203 } | 201 } |
204 | 202 |
205 void ImeAdapterAndroid::AttachImeAdapter( | 203 void ImeAdapterAndroid::AttachImeAdapter( |
206 JNIEnv* env, | 204 JNIEnv* env, |
207 const JavaParamRef<jobject>& java_object) { | 205 const JavaParamRef<jobject>& java_object) { |
208 java_ime_adapter_ = JavaObjectWeakGlobalRef(env, java_object); | 206 java_ime_adapter_ = JavaObjectWeakGlobalRef(env, java_object); |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
281 int after) { | 279 int after) { |
282 RenderFrameHostImpl* rfh = | 280 RenderFrameHostImpl* rfh = |
283 static_cast<RenderFrameHostImpl*>(GetFocusedFrame()); | 281 static_cast<RenderFrameHostImpl*>(GetFocusedFrame()); |
284 if (rfh) | 282 if (rfh) |
285 rfh->DeleteSurroundingText(before, after); | 283 rfh->DeleteSurroundingText(before, after); |
286 } | 284 } |
287 | 285 |
288 bool ImeAdapterAndroid::RequestTextInputStateUpdate( | 286 bool ImeAdapterAndroid::RequestTextInputStateUpdate( |
289 JNIEnv* env, | 287 JNIEnv* env, |
290 const JavaParamRef<jobject>&) { | 288 const JavaParamRef<jobject>&) { |
291 RenderWidgetHostImpl* rwhi = GetRenderWidgetHostImpl(); | 289 RenderWidgetHostImpl* rwhi = GetFocusedWidget(); |
292 if (!rwhi) | 290 if (!rwhi) |
293 return false; | 291 return false; |
294 rwhi->Send(new InputMsg_RequestTextInputStateUpdate(rwhi->GetRoutingID())); | 292 rwhi->Send(new InputMsg_RequestTextInputStateUpdate(rwhi->GetRoutingID())); |
295 return true; | 293 return true; |
296 } | 294 } |
297 | 295 |
298 void ImeAdapterAndroid::RequestCursorUpdate( | 296 void ImeAdapterAndroid::RequestCursorUpdate( |
299 JNIEnv* env, | 297 JNIEnv* env, |
300 const base::android::JavaParamRef<jobject>& obj, | 298 const base::android::JavaParamRef<jobject>& obj, |
301 bool immediate_request, | 299 bool immediate_request, |
302 bool monitor_request) { | 300 bool monitor_request) { |
303 RenderWidgetHostImpl* rwhi = GetRenderWidgetHostImpl(); | 301 RenderWidgetHostImpl* rwhi = GetFocusedWidget(); |
304 if (!rwhi) | 302 if (!rwhi) |
305 return; | 303 return; |
306 rwhi->Send(new InputMsg_RequestCompositionUpdate( | 304 rwhi->Send(new InputMsg_RequestCompositionUpdate( |
307 rwhi->GetRoutingID(), immediate_request, monitor_request)); | 305 rwhi->GetRoutingID(), immediate_request, monitor_request)); |
308 } | 306 } |
309 | 307 |
310 void ImeAdapterAndroid::ResetImeAdapter(JNIEnv* env, | 308 void ImeAdapterAndroid::ResetImeAdapter(JNIEnv* env, |
311 const JavaParamRef<jobject>&) { | 309 const JavaParamRef<jobject>&) { |
312 java_ime_adapter_.reset(); | 310 java_ime_adapter_.reset(); |
313 } | 311 } |
314 | 312 |
315 RenderWidgetHostImpl* ImeAdapterAndroid::GetRenderWidgetHostImpl() { | 313 RenderWidgetHostImpl* ImeAdapterAndroid::GetFocusedWidget() { |
316 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 314 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
317 DCHECK(rwhva_); | 315 return rwhva_->GetFocusedWidget(); |
318 RenderWidgetHost* rwh = rwhva_->GetRenderWidgetHost(); | |
319 if (!rwh) | |
320 return nullptr; | |
321 | |
322 return RenderWidgetHostImpl::From(rwh); | |
323 } | 316 } |
324 | 317 |
325 RenderFrameHost* ImeAdapterAndroid::GetFocusedFrame() { | 318 RenderFrameHost* ImeAdapterAndroid::GetFocusedFrame() { |
326 RenderWidgetHostImpl* rwh = GetRenderWidgetHostImpl(); | 319 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
327 if (!rwh) | 320 // We get the focused frame from the WebContents of the page. Although |
328 return nullptr; | 321 // |rwhva_->GetFocusedWidget()| does a similar thing, but, there is no direct |
Charlie Reis
2017/01/29 18:08:14
nit: Drop "but," (since you already lead with "Alt
EhsanK
2017/01/31 15:53:14
Done. Thanks!
| |
329 RenderViewHost* rvh = RenderViewHost::From(rwh); | 322 // way to get a RenderFrameHost from its RWH. |
330 if (!rvh) | 323 RenderWidgetHostImpl* rwh = |
331 return nullptr; | 324 RenderWidgetHostImpl::From(rwhva_->GetRenderWidgetHost()); |
332 FrameTreeNode* focused_frame = | 325 if (!rwh || !rwh->delegate()) |
Charlie Reis
2017/01/29 18:08:14
I think you might need a null check on the GetAsWe
EhsanK
2017/01/31 15:53:14
Acknowledged.
| |
333 rvh->GetDelegate()->GetFrameTree()->GetFocusedFrame(); | |
334 if (!focused_frame) | |
335 return nullptr; | 326 return nullptr; |
336 | 327 |
337 return focused_frame->current_frame_host(); | 328 return rwh->delegate()->GetAsWebContents()->GetFocusedFrame(); |
Charlie Reis
2017/01/29 18:08:14
Thanks-- much better to go through WebContents tha
EhsanK
2017/01/31 15:53:14
Acknowledged.
| |
338 } | 329 } |
339 | 330 |
340 WebContents* ImeAdapterAndroid::GetWebContents() { | 331 WebContents* ImeAdapterAndroid::GetWebContents() { |
341 RenderWidgetHostImpl* rwh = GetRenderWidgetHostImpl(); | 332 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
EhsanK
2017/01/31 15:53:14
This method was not actually used given that:
1-
Charlie Reis
2017/01/31 17:01:28
Great!
| |
342 if (!rwh) | 333 // WebContents is the delegate for any RWH on the page. Therefore, we simply |
334 // use the page's RWHV to get to the WebContents. | |
335 RenderWidgetHostImpl* rwh = | |
336 RenderWidgetHostImpl::From(rwhva_->GetRenderWidgetHost()); | |
337 if (!rwh || !rwh->delegate()) | |
343 return nullptr; | 338 return nullptr; |
344 return WebContents::FromRenderViewHost(RenderViewHost::From(rwh)); | 339 |
340 return rwh->delegate()->GetAsWebContents(); | |
345 } | 341 } |
346 | 342 |
347 std::vector<blink::WebCompositionUnderline> | 343 std::vector<blink::WebCompositionUnderline> |
348 ImeAdapterAndroid::GetUnderlinesFromSpans( | 344 ImeAdapterAndroid::GetUnderlinesFromSpans( |
349 JNIEnv* env, | 345 JNIEnv* env, |
350 const base::android::JavaParamRef<jobject>& obj, | 346 const base::android::JavaParamRef<jobject>& obj, |
351 const base::android::JavaParamRef<jobject>& text, | 347 const base::android::JavaParamRef<jobject>& text, |
352 const base::string16& text16) { | 348 const base::string16& text16) { |
353 std::vector<blink::WebCompositionUnderline> underlines; | 349 std::vector<blink::WebCompositionUnderline> underlines; |
354 // Iterate over spans in |text|, dispatch those that we care about (e.g., | 350 // Iterate over spans in |text|, dispatch those that we care about (e.g., |
355 // BackgroundColorSpan) to a matching callback (e.g., | 351 // BackgroundColorSpan) to a matching callback (e.g., |
356 // AppendBackgroundColorSpan()), and populate |underlines|. | 352 // AppendBackgroundColorSpan()), and populate |underlines|. |
357 Java_ImeAdapter_populateUnderlinesFromSpans( | 353 Java_ImeAdapter_populateUnderlinesFromSpans( |
358 env, obj, text, reinterpret_cast<jlong>(&underlines)); | 354 env, obj, text, reinterpret_cast<jlong>(&underlines)); |
359 | 355 |
360 // Sort spans by |.startOffset|. | 356 // Sort spans by |.startOffset|. |
361 std::sort(underlines.begin(), underlines.end()); | 357 std::sort(underlines.begin(), underlines.end()); |
362 | 358 |
363 return underlines; | 359 return underlines; |
364 } | 360 } |
365 | 361 |
366 } // namespace content | 362 } // namespace content |
OLD | NEW |