Almost finish moving context_menu_node_ from RenderViewImpl to RenderFrameImpl.

content/browser/renderer_host/render_widget_host_view_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 111 matching lines @@
 
 }  // anonymous namespace
 
 RenderWidgetHostViewAndroid::RenderWidgetHostViewAndroid(
     RenderWidgetHostImpl* widget_host,
     ContentViewCoreImpl* content_view_core)
     : host_(widget_host),
       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),
       weak_ptr_factory_(this),
       overscroll_effect_enabled_(
           !CommandLine::ForCurrentProcess()->
               HasSwitch(switches::kDisableOverscrollEdgeEffect)),
       overscroll_effect_(OverscrollGlow::Create(overscroll_effect_enabled_)),
       flush_input_requested_(false),
       accelerated_surface_route_id_(0),
@@ skipping 22 matching lines @@
   if (texture_id_in_layer_) {
     ImageTransportFactoryAndroid::GetInstance()->DeleteTexture(
         texture_id_in_layer_);
   }
 
   if (texture_layer_.get())
     texture_layer_->ClearClient();
 
   if (resource_collection_.get())
     resource_collection_->SetClient(NULL);
+  ime_adapter_android_->RenderWidgetGone();
 }
 
 
 bool RenderWidgetHostViewAndroid::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(RenderWidgetHostViewAndroid, message)
     IPC_MESSAGE_HANDLER(ViewHostMsg_StartContentIntent, OnStartContentIntent)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidChangeBodyBackgroundColor,
                         OnDidChangeBodyBackgroundColor)
@@ skipping 237 matching lines @@
 }
 
 void RenderWidgetHostViewAndroid::TextInputTypeChanged(
     ui::TextInputType type,
     ui::TextInputMode input_mode,
     bool can_compose_inline) {
   // Unused on Android, which uses OnTextInputChanged instead.
 }
 
 long RenderWidgetHostViewAndroid::GetNativeImeAdapter() {
-  return reinterpret_cast<intptr_t>(&ime_adapter_android_);
+  return reinterpret_cast<intptr_t>(ime_adapter_android_.get());
 }
 
 void RenderWidgetHostViewAndroid::OnTextInputStateChanged(
     const ViewHostMsg_TextInputState_Params& params) {
   // If an acknowledgement is required for this event, regardless of how we exit
   // from this method, we must acknowledge that we processed the input state
   // change.
   base::ScopedClosureRunner ack_caller;
   if (params.require_ack)
     ack_caller.Reset(base::Bind(&SendImeEventAck, host_));
@@ skipping 61 matching lines @@
     const base::string16& result) {
   // Custom serialization over IPC isn't allowed normally for security reasons.
   // Since this feature is only used in (single-process) WebView, there are no
   // security issues. Enforce that it's only called in single process mode.
   CHECK(RenderProcessHost::run_renderer_in_process());
   if (content_view_core_)
     content_view_core_->OnSmartClipDataExtracted(result);
 }
 
 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(
     const gfx::Rect& scroll_rect,
     const gfx::Vector2d& scroll_delta,
     const std::vector<gfx::Rect>& copy_rects,
     const std::vector<ui::LatencyInfo>& latency_info) {
   NOTIMPLEMENTED();
 }
 
@@ skipping 876 matching lines @@
 // RenderWidgetHostView, public:
 
 // static
 RenderWidgetHostView*
 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) {
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget);
   return new RenderWidgetHostViewAndroid(rwhi, NULL);
 }
 
 } // namespace content