| Index: content/browser/renderer_host/render_widget_host_view_android.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/render_widget_host_view_android.cc (revision 255633)
|
| +++ content/browser/renderer_host/render_widget_host_view_android.cc (working copy)
|
| @@ -129,7 +129,7 @@
|
| needs_begin_frame_(false),
|
| is_showing_(!widget_host->is_hidden()),
|
| content_view_core_(NULL),
|
| - ime_adapter_android_(this),
|
| + ime_adapter_android_(new ImeAdapterAndroid(this)),
|
| cached_background_color_(SK_ColorWHITE),
|
| texture_id_in_layer_(0),
|
| last_output_surface_id_(kUndefinedOutputSurfaceId),
|
| @@ -172,6 +172,7 @@
|
|
|
| if (resource_collection_.get())
|
| resource_collection_->SetClient(NULL);
|
| + ime_adapter_android_->RenderWidgetGone();
|
| }
|
|
|
|
|
| @@ -429,7 +430,7 @@
|
| }
|
|
|
| long RenderWidgetHostViewAndroid::GetNativeImeAdapter() {
|
| - return reinterpret_cast<intptr_t>(&ime_adapter_android_);
|
| + return reinterpret_cast<intptr_t>(ime_adapter_android_.get());
|
| }
|
|
|
| void RenderWidgetHostViewAndroid::OnTextInputStateChanged(
|
| @@ -511,11 +512,11 @@
|
| }
|
|
|
| void RenderWidgetHostViewAndroid::ImeCancelComposition() {
|
| - ime_adapter_android_.CancelComposition();
|
| + ime_adapter_android_->CancelComposition();
|
| }
|
|
|
| void RenderWidgetHostViewAndroid::FocusedNodeChanged(bool is_editable_node) {
|
| - ime_adapter_android_.FocusedNodeChanged(is_editable_node);
|
| + ime_adapter_android_->FocusedNodeChanged(is_editable_node);
|
| }
|
|
|
| void RenderWidgetHostViewAndroid::DidUpdateBackingStore(
|
|
|