Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / browser / renderer_host / ime_adapter_android.h

diff --git a/src/content/browser/renderer_host/ime_adapter_android.h b/src/content/browser/renderer_host/ime_adapter_android.h
index d3f7fee..50e9dbf 100644 (file)
--- a/src/content/browser/renderer_host/ime_adapter_android.h
+++ b/src/content/browser/renderer_host/ime_adapter_android.h
@@ -7,13 +7,17 @@
 
 #include <jni.h>
 
-#include "base/android/jni_helper.h"
+#include <vector>
+
+#include "base/android/jni_weak_ref.h"
+#include "ui/gfx/geometry/rect.h"
 
 namespace content {
 
 class RenderFrameHost;
 class RenderWidgetHostImpl;
 class RenderWidgetHostViewAndroid;
+class WebContents;
 struct NativeWebKeyboardEvent;
 
 // This class is in charge of dispatching key events from the java side
@@ -40,9 +44,14 @@ class ImeAdapterAndroid {
                              int event_type,
                              long timestamp_ms,
                              int native_key_code,
+                             int modifiers,
                              int unicode_char);
-  void SetComposingText(JNIEnv*, jobject, jstring text, int new_cursor_pos);
-  void CommitText(JNIEnv*, jobject, jstring text);
+  void SetComposingText(JNIEnv*,
+                        jobject obj,
+                        jobject text,
+                        jstring text_str,
+                        int new_cursor_pos);
+  void CommitText(JNIEnv*, jobject, jstring text_str);
   void FinishComposingText(JNIEnv* env, jobject);
   void AttachImeAdapter(JNIEnv*, jobject java_object);
   void SetEditableSelectionOffsets(JNIEnv*, jobject, int start, int end);
@@ -58,10 +67,12 @@ class ImeAdapterAndroid {
   // Called from native -> java
   void CancelComposition();
   void FocusedNodeChanged(bool is_editable_node);
+  void SetCharacterBounds(const std::vector<gfx::Rect>& rects);
 
  private:
   RenderWidgetHostImpl* GetRenderWidgetHostImpl();
   RenderFrameHost* GetFocusedFrame();
+  WebContents* GetWebContents();
 
   RenderWidgetHostViewAndroid* rwhva_;
   JavaObjectWeakGlobalRef java_ime_adapter_;