Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(500)

Unified Diff: content/browser/renderer_host/ime_adapter_android.cc

Issue 10911012: Upstream Android IME support (ImeAdapter). (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: nits fixed; recent downstream changes applied; ime adapter added to browser_jni_registrar Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/ime_adapter_android.cc
diff --git a/content/browser/renderer_host/ime_adapter_android.cc b/content/browser/renderer_host/ime_adapter_android.cc
index a848dccf91a6f9b73b897f27976c42bd59da709f..c8bb0e3f2d11e5d163915b3ed35495902bd38a23 100644
--- a/content/browser/renderer_host/ime_adapter_android.cc
+++ b/content/browser/renderer_host/ime_adapter_android.cc
@@ -4,12 +4,52 @@
#include "content/browser/renderer_host/ime_adapter_android.h"
+#include <android/input.h>
+
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
+#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_android.h"
#include "content/common/view_messages.h"
+#include "content/public/browser/native_web_keyboard_event.h"
#include "jni/ImeAdapter_jni.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
+
+using base::android::AttachCurrentThread;
+using base::android::ConvertJavaStringToUTF16;
+using content::NativeWebKeyboardEvent;
+using content::RenderWidgetHostImpl;
+
+namespace {
+
+// Maps a java KeyEvent into a NativeWebKeyboardEvent.
+// |java_key_event| is used to maintain a globalref for KeyEvent.
+// |action| will help determine the WebInputEvent type.
+// type, |modifiers|, |time_ms|, |key_code|, |unicode_char| is used to create
+// WebKeyboardEvent. |key_code| is also needed ad need to treat the enter key
+// as a key press of character \r.
+NativeWebKeyboardEvent NativeWebKeyboardEventFromKeyEvent(
+ JNIEnv* env,
+ jobject java_key_event,
+ int action,
+ int modifiers,
+ long time_ms,
+ int key_code,
+ bool is_system_key,
+ int unicode_char) {
+ WebKit::WebInputEvent::Type type = WebKit::WebInputEvent::Undefined;
+ if (action == AKEY_EVENT_ACTION_DOWN)
+ type = WebKit::WebInputEvent::RawKeyDown;
+ else if (action == AKEY_EVENT_ACTION_UP)
+ type = WebKit::WebInputEvent::KeyUp;
+ return NativeWebKeyboardEvent(java_key_event, type, modifiers,
+ time_ms, key_code, unicode_char, is_system_key);
+}
+
+} // anonymous namespace
namespace content {
@@ -17,6 +57,33 @@ bool RegisterImeAdapter(JNIEnv* env) {
if (!RegisterNativesImpl(env))
return false;
+ Java_ImeAdapter_initializeWebInputEvents(env,
+ WebKit::WebInputEvent::RawKeyDown,
+ WebKit::WebInputEvent::KeyUp,
+ WebKit::WebInputEvent::Char,
+ WebKit::WebInputEvent::ShiftKey,
+ WebKit::WebInputEvent::AltKey,
+ WebKit::WebInputEvent::ControlKey,
+ WebKit::WebInputEvent::CapsLockOn,
+ WebKit::WebInputEvent::NumLockOn);
+ Java_ImeAdapter_initializeTextInputTypes(
+ env,
+ ui::TEXT_INPUT_TYPE_NONE,
+ ui::TEXT_INPUT_TYPE_TEXT,
+ ui::TEXT_INPUT_TYPE_TEXT_AREA,
+ ui::TEXT_INPUT_TYPE_PASSWORD,
+ ui::TEXT_INPUT_TYPE_SEARCH,
+ ui::TEXT_INPUT_TYPE_URL,
+ ui::TEXT_INPUT_TYPE_EMAIL,
+ ui::TEXT_INPUT_TYPE_TELEPHONE,
+ ui::TEXT_INPUT_TYPE_NUMBER,
+ ui::TEXT_INPUT_TYPE_DATE,
+ ui::TEXT_INPUT_TYPE_DATE_TIME,
+ ui::TEXT_INPUT_TYPE_DATE_TIME_LOCAL,
+ ui::TEXT_INPUT_TYPE_MONTH,
+ ui::TEXT_INPUT_TYPE_TIME,
+ ui::TEXT_INPUT_TYPE_WEEK,
+ ui::TEXT_INPUT_TYPE_CONTENT_EDITABLE);
return true;
}
@@ -33,6 +100,135 @@ ImeAdapterAndroid::~ImeAdapterAndroid() {
}
}
+bool ImeAdapterAndroid::SendSyntheticKeyEvent(JNIEnv*,
+ jobject,
+ int type,
+ long time_ms,
+ int key_code,
+ int text) {
+ NativeWebKeyboardEvent event(static_cast<WebKit::WebInputEvent::Type>(type),
+ 0 /* modifiers */, time_ms / 1000.0, key_code,
+ text, false /* is_system_key */);
+ rwhva_->SendKeyEvent(event);
+ return true;
+}
+
+bool ImeAdapterAndroid::SendKeyEvent(JNIEnv* env, jobject,
+ jobject original_key_event,
+ int action, int modifiers,
+ long time_ms, int key_code,
+ bool is_system_key, int unicode_char) {
+ NativeWebKeyboardEvent event = NativeWebKeyboardEventFromKeyEvent(
+ env, original_key_event, action, modifiers,
+ time_ms, key_code, is_system_key, unicode_char);
+ rwhva_->SendKeyEvent(event);
+ if (event.type == WebKit::WebInputEvent::RawKeyDown && event.text[0]) {
+ // Send a Char event, but without an os_event since we don't want to
+ // roundtrip back to java such synthetic event.
+ NativeWebKeyboardEvent char_event(event);
+ char_event.os_event = NULL;
+ event.type = WebKit::WebInputEvent::Char;
+ rwhva_->SendKeyEvent(event);
+ }
+ return true;
+}
+
+void ImeAdapterAndroid::SetComposingText(JNIEnv* env, jobject, jstring text,
+ int new_cursor_pos) {
+ RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(
+ rwhva_->GetRenderWidgetHost());
+ if (!rwhi)
+ return;
+
+ string16 text16 = ConvertJavaStringToUTF16(env, text);
+ std::vector<WebKit::WebCompositionUnderline> underlines;
+ underlines.push_back(
+ WebKit::WebCompositionUnderline(0, text16.length(), SK_ColorBLACK,
+ false));
+ // new_cursor_position is as described in the Android API for
+ // InputConnection#setComposingText, whereas the parameters for
+ // ImeSetComposition are relative to the start of the composition.
+ if (new_cursor_pos > 0)
+ new_cursor_pos = text16.length() + new_cursor_pos - 1;
+
+ rwhi->ImeSetComposition(text16, underlines, new_cursor_pos, new_cursor_pos);
+}
+
+
+void ImeAdapterAndroid::CommitText(JNIEnv* env, jobject, jstring text) {
+ RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(
+ rwhva_->GetRenderWidgetHost());
+ if (!rwhi)
+ return;
+
+ string16 text16 = ConvertJavaStringToUTF16(env, text);
+ rwhi->ImeConfirmComposition(text16);
+}
+
+void ImeAdapterAndroid::AttachImeAdapter(JNIEnv* env, jobject java_object) {
+ java_ime_adapter_ = AttachCurrentThread()->NewGlobalRef(java_object);
+}
+
+void ImeAdapterAndroid::CancelComposition() {
+ Java_ImeAdapter_cancelComposition(AttachCurrentThread(), java_ime_adapter_);
+}
+
+void ImeAdapterAndroid::ReplaceText(JNIEnv* env, jobject, jstring text) {
+ RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(
+ rwhva_->GetRenderWidgetHost());
+ if (!rwhi)
+ return;
+
+ string16 text16 = ConvertJavaStringToUTF16(env, text);
+ rwhi->Send(new ViewMsg_ReplaceAll(rwhi->GetRoutingID(), text16));
+}
+
+void ImeAdapterAndroid::ClearFocus(JNIEnv* env, jobject) {
+ RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(
+ rwhva_->GetRenderWidgetHost());
+ if (!rwhi)
+ return;
+
+ rwhi->Send(new ViewMsg_ClearFocusedNode(rwhi->GetRoutingID()));
+}
+
+void ImeAdapterAndroid::SetEditableSelectionOffsets(JNIEnv*, jobject,
+ int start, int end) {
+ RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(
+ rwhva_->GetRenderWidgetHost());
+ if (!rwhi)
+ return;
+
+ rwhi->Send(new ViewMsg_SetEditableSelectionOffsets(rwhi->GetRoutingID(),
+ start, end));
+}
+
+void ImeAdapterAndroid::SetComposingRegion(JNIEnv*, jobject,
+ int start, int end) {
+ RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(
+ rwhva_->GetRenderWidgetHost());
+ if (!rwhi)
+ return;
+
+ std::vector<WebKit::WebCompositionUnderline> underlines;
+ underlines.push_back(
+ WebKit::WebCompositionUnderline(0, end - start, SK_ColorBLACK, false));
+
+ rwhi->Send(new ViewMsg_SetCompositionFromExistingText(
+ rwhi->GetRoutingID(), start, end, underlines));
+}
+
+void ImeAdapterAndroid::DeleteSurroundingText(JNIEnv*, jobject,
+ int before, int after) {
+ RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(
+ rwhva_->GetRenderWidgetHost());
+ if (!rwhi)
+ return;
+
+ rwhi->Send(new ViewMsg_ExtendSelectionAndDelete(rwhi->GetRoutingID(),
+ before, after));
+}
+
void ImeAdapterAndroid::Unselect(JNIEnv* env, jobject) {
RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(
rwhva_->GetRenderWidgetHost());
@@ -78,4 +274,4 @@ void ImeAdapterAndroid::Paste(JNIEnv* env, jobject) {
rwhi->Send(new ViewMsg_Paste(rwhi->GetRoutingID()));
}
-} // namespace content
+} // namespace content
« no previous file with comments | « content/browser/renderer_host/ime_adapter_android.h ('k') | content/browser/renderer_host/render_widget_host_view_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698