BrowserPluginGuest should carry the correct text input states when notifying the text input type cha

content/browser/browser_plugin/browser_plugin_guest.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/browser_plugin/browser_plugin_guest.h"
 
 #include <algorithm>
 
 #include "base/message_loop/message_loop.h"
 #include "base/pickle.h"
@@ skipping 74 matching lines @@
       browser_plugin_instance_id_(browser_plugin::kInstanceIDNone),
       focused_(false),
       mouse_locked_(false),
       pending_lock_request_(false),
       guest_visible_(false),
       embedder_visible_(true),
       is_full_page_plugin_(false),
       has_render_view_(has_render_view),
       is_in_destruction_(false),
       initialized_(false),
-      last_text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
-      last_input_mode_(ui::TEXT_INPUT_MODE_DEFAULT),
-      last_input_flags_(0),
-      last_can_compose_inline_(true),
       guest_proxy_routing_id_(MSG_ROUTING_NONE),
       last_drag_status_(blink::WebDragStatusUnknown),
       seen_embedder_system_drag_ended_(false),
       seen_embedder_drag_source_ended_at_(false),
       delegate_(delegate),
       weak_ptr_factory_(this) {
   DCHECK(web_contents);
   DCHECK(delegate);
   RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.Create"));
   web_contents->SetBrowserPluginGuest(this);
@@ skipping 458 matching lines @@
     // embedder shutdown or when the embedder navigates to a different page.
     // The call stack is roughly:
     // BrowserPluginGuest::SetFocus()
     // content::InterstitialPageImpl::Hide()
     // content::InterstitialPageImpl::DontProceed().
     //
     // TODO(lazyboy): Write a WebUI test once http://crbug.com/463674 is fixed.
     return;
   }
 
-  ViewHostMsg_TextInputState_Params params;
-  params.type = last_text_input_type_;
-  params.mode = last_input_mode_;
-  params.flags = last_input_flags_;
-  params.can_compose_inline = last_can_compose_inline_;
-  guest_rwhv->TextInputStateChanged(params);
+  if (last_text_input_state_.get())
+    guest_rwhv->TextInputStateChanged(*last_text_input_state_);
 }
 
 void BrowserPluginGuest::DidCommitProvisionalLoadForFrame(
     RenderFrameHost* render_frame_host,
     const GURL& url,
     ui::PageTransition transition_type) {
   RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.DidNavigate"));
 }
 
 void BrowserPluginGuest::RenderViewReady() {
@@ skipping 376 matching lines @@
 }
 
 void BrowserPluginGuest::OnTakeFocus(bool reverse) {
   SendMessageToEmbedder(
       new BrowserPluginMsg_AdvanceFocus(browser_plugin_instance_id(), reverse));
 }
 
 void BrowserPluginGuest::OnTextInputStateChanged(
     const ViewHostMsg_TextInputState_Params& params) {
   // Save the state of text input so we can restore it on focus.
-  last_text_input_type_ = params.type;
-  last_input_mode_ = params.mode;
-  last_input_flags_ = params.flags;
-  last_can_compose_inline_ = params.can_compose_inline;
+  last_text_input_state_.reset(new ViewHostMsg_TextInputState_Params(params));
 
   SendTextInputTypeChangedToView(
       static_cast<RenderWidgetHostViewBase*>(
           web_contents()->GetRenderWidgetHostView()));
 }
 
 void BrowserPluginGuest::OnImeCancelComposition() {
   static_cast<RenderWidgetHostViewBase*>(
       web_contents()->GetRenderWidgetHostView())->ImeCancelComposition();
 }
 
 #if defined(OS_MACOSX) || defined(USE_AURA)
 void BrowserPluginGuest::OnImeCompositionRangeChanged(
       const gfx::Range& range,
       const std::vector<gfx::Rect>& character_bounds) {
   static_cast<RenderWidgetHostViewBase*>(
       web_contents()->GetRenderWidgetHostView())->ImeCompositionRangeChanged(
           range, character_bounds);
 }
 #endif
 
 void BrowserPluginGuest::SetContextMenuPosition(const gfx::Point& position) {
   if (delegate_)
     delegate_->SetContextMenuPosition(position);
 }
 
 }  // namespace content