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

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

Issue 2752113005: Let ImeAdapterAndroid have the same lifecycle as its Java peer (Closed)
Patch Set: comments Created 3 years, 9 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/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..aedb2960bb3a2c142b559a364e5598069a770d9e 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -41,6 +41,7 @@
#include "content/browser/accessibility/browser_accessibility_manager_android.h"
#include "content/browser/android/composited_touch_handle_drawable.h"
#include "content/browser/android/content_view_core_impl.h"
+#include "content/browser/android/ime_adapter_android.h"
#include "content/browser/android/overscroll_controller_android.h"
#include "content/browser/android/synchronous_compositor_host.h"
#include "content/browser/compositor/surface_utils.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,10 +705,6 @@ void RenderWidgetHostViewAndroid::SetIsLoading(bool is_loading) {
// is TabContentsDelegate.
}
-long RenderWidgetHostViewAndroid::GetNativeImeAdapter() {
- return reinterpret_cast<intptr_t>(&ime_adapter_android_);
-}
-
// -----------------------------------------------------------------------------
// TextInputManager::Observer implementations.
void RenderWidgetHostViewAndroid::OnUpdateTextInputStateCalled(
@@ -725,10 +723,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 +741,16 @@ void RenderWidgetHostViewAndroid::OnImeCompositionRangeChanged(
for (const gfx::Rect& rect : info->character_bounds)
character_bounds.emplace_back(rect);
- ime_adapter_android_.SetCharacterBounds(character_bounds);
+ if (ime_adapter_android_)
+ 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();
+ if (ime_adapter_android_)
+ ime_adapter_android_->CancelComposition();
}
void RenderWidgetHostViewAndroid::OnTextSelectionChanged(
@@ -1004,7 +1003,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);
+ if (ime_adapter_android_)
+ ime_adapter_android_->FocusedNodeChanged(is_editable_node);
}
void RenderWidgetHostViewAndroid::RenderProcessGone(

Powered by Google App Engine
This is Rietveld 408576698