Index: content/browser/renderer_host/render_widget_host_view_android.cc |
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc |
index 51658bd97e183299957fffad8d66b27452d4f7e5..c1197f51e546ec99a2b679ddc3a4943195a346b5 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_android.cc |
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
@@ -53,6 +53,7 @@ |
#include "content/browser/renderer_host/compositor_impl_android.h" |
#include "content/browser/renderer_host/dip_util.h" |
#include "content/browser/renderer_host/frame_metadata_util.h" |
+#include "content/browser/renderer_host/ime_adapter_android.h" |
#include "content/browser/renderer_host/input/input_router_impl.h" |
#include "content/browser/renderer_host/input/synthetic_gesture_target_android.h" |
#include "content/browser/renderer_host/input/web_input_event_builders_android.h" |
@@ -449,7 +450,7 @@ RenderWidgetHostViewAndroid::RenderWidgetHostViewAndroid( |
is_window_activity_started_(true), |
is_in_vr_(false), |
content_view_core_(nullptr), |
- ime_adapter_android_(this), |
+ ime_adapter_android_(nullptr), |
cached_background_color_(SK_ColorWHITE), |
view_(this), |
last_compositor_frame_sink_id_(kUndefinedCompositorFrameSinkId), |
@@ -496,6 +497,7 @@ RenderWidgetHostViewAndroid::~RenderWidgetHostViewAndroid() { |
if (content_view_core_) |
content_view_core_->RemoveObserver(this); |
SetContentViewCore(NULL); |
+ ime_adapter_android_ = nullptr; |
DCHECK(ack_callbacks_.empty()); |
DCHECK(!delegated_frame_host_); |
} |
@@ -703,8 +705,11 @@ void RenderWidgetHostViewAndroid::SetIsLoading(bool is_loading) { |
// is TabContentsDelegate. |
} |
-long RenderWidgetHostViewAndroid::GetNativeImeAdapter() { |
- return reinterpret_cast<intptr_t>(&ime_adapter_android_); |
+void RenderWidgetHostViewAndroid::ConnectImeAdapter( |
+ ImeAdapterAndroid* ime_adapter) { |
+ ime_adapter_android_ = ime_adapter; |
+ if (ime_adapter) |
+ ime_adapter->SetRenderWidgetHostViewAndroid(weak_ptr_factory_.GetWeakPtr()); |
} |
// ----------------------------------------------------------------------------- |
@@ -725,10 +730,9 @@ void RenderWidgetHostViewAndroid::OnUpdateTextInputStateCalled( |
return; |
content_view_core_->UpdateImeAdapter( |
- GetNativeImeAdapter(), static_cast<int>(state.type), state.flags, |
- state.mode, state.value, state.selection_start, state.selection_end, |
- state.composition_start, state.composition_end, state.show_ime_if_needed, |
- state.reply_to_request); |
+ static_cast<int>(state.type), state.flags, state.mode, state.value, |
+ state.selection_start, state.selection_end, state.composition_start, |
+ state.composition_end, state.show_ime_if_needed, state.reply_to_request); |
} |
void RenderWidgetHostViewAndroid::OnImeCompositionRangeChanged( |
@@ -744,14 +748,16 @@ void RenderWidgetHostViewAndroid::OnImeCompositionRangeChanged( |
for (const gfx::Rect& rect : info->character_bounds) |
character_bounds.emplace_back(rect); |
- ime_adapter_android_.SetCharacterBounds(character_bounds); |
+ DCHECK(ime_adapter_android_); |
boliu
2017/03/24 17:13:16
what makes these DCHECKs hold?
Jinsuk Kim
2017/03/27 03:19:33
It should always be set by the time any Ime calls
boliu
2017/03/27 17:18:12
The is not answering my question.
In the pop up f
Jinsuk Kim
2017/03/27 22:38:19
Hm, haven't checked such case. It would have been
|
+ ime_adapter_android_->SetCharacterBounds(character_bounds); |
} |
void RenderWidgetHostViewAndroid::OnImeCancelComposition( |
TextInputManager* text_input_manager, |
RenderWidgetHostViewBase* updated_view) { |
DCHECK_EQ(text_input_manager_, text_input_manager); |
- ime_adapter_android_.CancelComposition(); |
+ DCHECK(ime_adapter_android_); |
+ ime_adapter_android_->CancelComposition(); |
} |
void RenderWidgetHostViewAndroid::OnTextSelectionChanged( |
@@ -1004,7 +1010,8 @@ void RenderWidgetHostViewAndroid::SetMultiTouchZoomSupportEnabled( |
void RenderWidgetHostViewAndroid::FocusedNodeChanged( |
bool is_editable_node, |
const gfx::Rect& node_bounds_in_screen) { |
- ime_adapter_android_.FocusedNodeChanged(is_editable_node); |
+ DCHECK(ime_adapter_android_); |
+ ime_adapter_android_->FocusedNodeChanged(is_editable_node); |
} |
void RenderWidgetHostViewAndroid::RenderProcessGone( |
@@ -1872,6 +1879,8 @@ void RenderWidgetHostViewAndroid::SetContentViewCore( |
parent_view->GetLayer()->AddChild(view_.GetLayer()); |
} |
content_view_core_ = content_view_core; |
+ ConnectImeAdapter(content_view_core ? content_view_core->ime_adapter() |
boliu
2017/03/24 17:13:16
is this call still needed? if so, can we move this
Jinsuk Kim
2017/03/27 03:19:33
Not necessary any more as IAA is now observing web
|
+ : nullptr); |
} |
BrowserAccessibilityManager* manager = NULL; |