| 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 <android/input.h> | 7 #include <android/input.h> |
| 8 | 8 |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 | 56 |
| 57 Java_ImeAdapter_initializeWebInputEvents(env, | 57 Java_ImeAdapter_initializeWebInputEvents(env, |
| 58 WebKit::WebInputEvent::RawKeyDown, | 58 WebKit::WebInputEvent::RawKeyDown, |
| 59 WebKit::WebInputEvent::KeyUp, | 59 WebKit::WebInputEvent::KeyUp, |
| 60 WebKit::WebInputEvent::Char, | 60 WebKit::WebInputEvent::Char, |
| 61 WebKit::WebInputEvent::ShiftKey, | 61 WebKit::WebInputEvent::ShiftKey, |
| 62 WebKit::WebInputEvent::AltKey, | 62 WebKit::WebInputEvent::AltKey, |
| 63 WebKit::WebInputEvent::ControlKey, | 63 WebKit::WebInputEvent::ControlKey, |
| 64 WebKit::WebInputEvent::CapsLockOn, | 64 WebKit::WebInputEvent::CapsLockOn, |
| 65 WebKit::WebInputEvent::NumLockOn); | 65 WebKit::WebInputEvent::NumLockOn); |
| 66 // TODO(miguelg): remove date time related enums after |
| 67 // https://bugs.webkit.org/show_bug.cgi?id=100935. |
| 66 Java_ImeAdapter_initializeTextInputTypes( | 68 Java_ImeAdapter_initializeTextInputTypes( |
| 67 env, | 69 env, |
| 68 ui::TEXT_INPUT_TYPE_NONE, | 70 ui::TEXT_INPUT_TYPE_NONE, |
| 69 ui::TEXT_INPUT_TYPE_TEXT, | 71 ui::TEXT_INPUT_TYPE_TEXT, |
| 70 ui::TEXT_INPUT_TYPE_TEXT_AREA, | 72 ui::TEXT_INPUT_TYPE_TEXT_AREA, |
| 71 ui::TEXT_INPUT_TYPE_PASSWORD, | 73 ui::TEXT_INPUT_TYPE_PASSWORD, |
| 72 ui::TEXT_INPUT_TYPE_SEARCH, | 74 ui::TEXT_INPUT_TYPE_SEARCH, |
| 73 ui::TEXT_INPUT_TYPE_URL, | 75 ui::TEXT_INPUT_TYPE_URL, |
| 74 ui::TEXT_INPUT_TYPE_EMAIL, | 76 ui::TEXT_INPUT_TYPE_EMAIL, |
| 75 ui::TEXT_INPUT_TYPE_TELEPHONE, | 77 ui::TEXT_INPUT_TYPE_TELEPHONE, |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 } | 165 } |
| 164 | 166 |
| 165 void ImeAdapterAndroid::AttachImeAdapter(JNIEnv* env, jobject java_object) { | 167 void ImeAdapterAndroid::AttachImeAdapter(JNIEnv* env, jobject java_object) { |
| 166 java_ime_adapter_ = AttachCurrentThread()->NewGlobalRef(java_object); | 168 java_ime_adapter_ = AttachCurrentThread()->NewGlobalRef(java_object); |
| 167 } | 169 } |
| 168 | 170 |
| 169 void ImeAdapterAndroid::CancelComposition() { | 171 void ImeAdapterAndroid::CancelComposition() { |
| 170 Java_ImeAdapter_cancelComposition(AttachCurrentThread(), java_ime_adapter_); | 172 Java_ImeAdapter_cancelComposition(AttachCurrentThread(), java_ime_adapter_); |
| 171 } | 173 } |
| 172 | 174 |
| 173 void ImeAdapterAndroid::ReplaceText(JNIEnv* env, jobject, jstring text) { | 175 void ImeAdapterAndroid::ReplaceDateTime(JNIEnv* env, jobject, jstring text) { |
| 174 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From( | 176 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From( |
| 175 rwhva_->GetRenderWidgetHost()); | 177 rwhva_->GetRenderWidgetHost()); |
| 176 if (!rwhi) | 178 if (!rwhi) |
| 177 return; | 179 return; |
| 178 | 180 |
| 179 string16 text16 = ConvertJavaStringToUTF16(env, text); | 181 string16 text16 = ConvertJavaStringToUTF16(env, text); |
| 180 rwhi->Send(new ViewMsg_ReplaceAll(rwhi->GetRoutingID(), text16)); | 182 rwhi->Send(new ViewMsg_ReplaceDateTime(rwhi->GetRoutingID(), text16)); |
| 181 } | 183 } |
| 182 | 184 |
| 183 void ImeAdapterAndroid::ClearFocus(JNIEnv* env, jobject) { | 185 |
| 186 void ImeAdapterAndroid::CancelDialog(JNIEnv* env, jobject) { |
| 184 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From( | 187 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From( |
| 185 rwhva_->GetRenderWidgetHost()); | 188 rwhva_->GetRenderWidgetHost()); |
| 186 if (!rwhi) | 189 if (!rwhi) |
| 187 return; | 190 return; |
| 188 | 191 |
| 189 rwhi->Send(new ViewMsg_ClearFocusedNode(rwhi->GetRoutingID())); | 192 rwhi->Send(new ViewMsg_CancelDateTimeDialog(rwhi->GetRoutingID())); |
| 190 } | 193 } |
| 191 | 194 |
| 192 void ImeAdapterAndroid::SetEditableSelectionOffsets(JNIEnv*, jobject, | 195 void ImeAdapterAndroid::SetEditableSelectionOffsets(JNIEnv*, jobject, |
| 193 int start, int end) { | 196 int start, int end) { |
| 194 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From( | 197 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From( |
| 195 rwhva_->GetRenderWidgetHost()); | 198 rwhva_->GetRenderWidgetHost()); |
| 196 if (!rwhi) | 199 if (!rwhi) |
| 197 return; | 200 return; |
| 198 | 201 |
| 199 rwhi->Send(new ViewMsg_SetEditableSelectionOffsets(rwhi->GetRoutingID(), | 202 rwhi->Send(new ViewMsg_SetEditableSelectionOffsets(rwhi->GetRoutingID(), |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 265 void ImeAdapterAndroid::Paste(JNIEnv* env, jobject) { | 268 void ImeAdapterAndroid::Paste(JNIEnv* env, jobject) { |
| 266 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From( | 269 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From( |
| 267 rwhva_->GetRenderWidgetHost()); | 270 rwhva_->GetRenderWidgetHost()); |
| 268 if (!rwhi) | 271 if (!rwhi) |
| 269 return; | 272 return; |
| 270 | 273 |
| 271 rwhi->Send(new ViewMsg_Paste(rwhi->GetRoutingID())); | 274 rwhi->Send(new ViewMsg_Paste(rwhi->GetRoutingID())); |
| 272 } | 275 } |
| 273 | 276 |
| 274 } // namespace content | 277 } // namespace content |
| OLD | NEW |