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

Side by Side Diff: content/browser/android/ime_adapter_android.h

Issue 2650113004: [WIP] Add support for Android SuggestionSpans when editing text (Closed)
Patch Set: Uploading the latest version from my repo so I can reference it Created 3 years, 7 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 unified diff | Download patch
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/android/ime_adapter_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 #ifndef CONTENT_BROWSER_ANDROID_IME_ADAPTER_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_IME_ADAPTER_ANDROID_H_
6 #define CONTENT_BROWSER_ANDROID_IME_ADAPTER_ANDROID_H_ 6 #define CONTENT_BROWSER_ANDROID_IME_ADAPTER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/android/jni_weak_ref.h" 12 #include "base/android/jni_weak_ref.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "content/common/content_export.h" 14 #include "content/common/content_export.h"
15 #include "content/public/browser/web_contents_observer.h" 15 #include "content/public/browser/web_contents_observer.h"
16 #include "third_party/WebKit/public/platform/input_host.mojom.h"
17 #include "third_party/WebKit/public/platform/input_messages.mojom.h"
16 #include "ui/gfx/geometry/rect_f.h" 18 #include "ui/gfx/geometry/rect_f.h"
17 19
18 namespace blink { 20 namespace blink {
19 21
20 struct WebCompositionUnderline; 22 struct WebCompositionUnderline;
23 struct WebTextSuggestionInfo;
21 24
22 } // namespace blink 25 } // namespace blink
23 26
24 namespace content { 27 namespace content {
25 28
26 class RenderFrameHost; 29 class RenderFrameHost;
27 class RenderWidgetHostImpl; 30 class RenderWidgetHostImpl;
28 class RenderWidgetHostViewAndroid; 31 class RenderWidgetHostViewAndroid;
29 32
30 // This class is in charge of dispatching key events from the java side 33 // This class is in charge of dispatching key events from the java side
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 JNIEnv*, 82 JNIEnv*,
80 const base::android::JavaParamRef<jobject>&, 83 const base::android::JavaParamRef<jobject>&,
81 int before, 84 int before,
82 int after); 85 int after);
83 void RequestCursorUpdate(JNIEnv*, 86 void RequestCursorUpdate(JNIEnv*,
84 const base::android::JavaParamRef<jobject>&, 87 const base::android::JavaParamRef<jobject>&,
85 bool immediateRequest, 88 bool immediateRequest,
86 bool monitorRequest); 89 bool monitorRequest);
87 bool RequestTextInputStateUpdate(JNIEnv*, 90 bool RequestTextInputStateUpdate(JNIEnv*,
88 const base::android::JavaParamRef<jobject>&); 91 const base::android::JavaParamRef<jobject>&);
92 void ApplySuggestionReplacement(JNIEnv*,
93 const base::android::JavaParamRef<jobject>&,
94 long documentMarkerID,
95 int suggestionIndex);
96 void DeleteSuggestionHighlight(JNIEnv*,
97 const base::android::JavaParamRef<jobject>&);
98 void SuggestionMenuClosed(JNIEnv*,
99 const base::android::JavaParamRef<jobject>&);
89 100
90 // Called from native -> java 101 // Called from native -> java
91 void CancelComposition(); 102 void CancelComposition();
92 void FocusedNodeChanged(bool is_editable_node); 103 void FocusedNodeChanged(bool is_editable_node);
93 void SetCharacterBounds(const std::vector<gfx::RectF>& rects); 104 void SetCharacterBounds(const std::vector<gfx::RectF>& rects);
105 void ShowTextSuggestionMenu(
106 const std::vector<blink::mojom::TextSuggestionInfoPtr>& suggestion_infos);
94 107
95 base::android::ScopedJavaLocalRef<jobject> java_ime_adapter_for_testing( 108 base::android::ScopedJavaLocalRef<jobject> java_ime_adapter_for_testing(
96 JNIEnv* env) { 109 JNIEnv* env) {
97 return java_ime_adapter_.get(env); 110 return java_ime_adapter_.get(env);
98 } 111 }
99 112
100 // WebContentsObserver implementation. 113 // WebContentsObserver implementation.
101 void RenderViewReady() override; 114 void RenderViewReady() override;
102 void RenderViewHostChanged(RenderViewHost* old_host, 115 void RenderViewHostChanged(RenderViewHost* old_host,
103 RenderViewHost* new_host) override; 116 RenderViewHost* new_host) override;
104 void DidAttachInterstitialPage() override; 117 void DidAttachInterstitialPage() override;
105 void DidDetachInterstitialPage() override; 118 void DidDetachInterstitialPage() override;
106 void WebContentsDestroyed() override; 119 void WebContentsDestroyed() override;
107 120
108 private: 121 private:
109 RenderWidgetHostImpl* GetFocusedWidget(); 122 RenderWidgetHostImpl* GetFocusedWidget();
110 RenderFrameHost* GetFocusedFrame(); 123 RenderFrameHost* GetFocusedFrame();
111 std::vector<blink::WebCompositionUnderline> GetUnderlinesFromSpans( 124 std::vector<blink::WebCompositionUnderline> GetUnderlinesFromSpans(
112 JNIEnv* env, 125 JNIEnv* env,
113 const base::android::JavaParamRef<jobject>& obj, 126 const base::android::JavaParamRef<jobject>& obj,
114 const base::android::JavaParamRef<jobject>& text, 127 const base::android::JavaParamRef<jobject>& text,
115 const base::string16& text16); 128 const base::string16& text16);
129 const blink::mojom::TextSuggestionBackendPtr& GetTextSuggestionBackend();
116 RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid() const; 130 RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid() const;
117 void UpdateRenderProcessConnection(RenderWidgetHostViewAndroid* new_rwhva); 131 void UpdateRenderProcessConnection(RenderWidgetHostViewAndroid* new_rwhva);
118 132
119 base::WeakPtr<RenderWidgetHostViewAndroid> rwhva_; 133 base::WeakPtr<RenderWidgetHostViewAndroid> rwhva_;
120 JavaObjectWeakGlobalRef java_ime_adapter_; 134 JavaObjectWeakGlobalRef java_ime_adapter_;
135 blink::mojom::TextSuggestionBackendPtr text_suggestion_backend_;
121 }; 136 };
122 137
123 bool RegisterImeAdapter(JNIEnv* env); 138 bool RegisterImeAdapter(JNIEnv* env);
124 139
125 } // namespace content 140 } // namespace content
126 141
127 #endif // CONTENT_BROWSER_ANDROID_IME_ADAPTER_ANDROID_H_ 142 #endif // CONTENT_BROWSER_ANDROID_IME_ADAPTER_ANDROID_H_
OLDNEW
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/android/ime_adapter_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698