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

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

Issue 183923030: Almost finish moving context_menu_node_ from RenderViewImpl to RenderFrameImpl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: sync Created 6 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
===================================================================
--- 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(

Powered by Google App Engine
This is Rietveld 408576698