Browser Plugin: Don't crash browser when reloading crashed webview

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 91 matching lines @@
   is_in_destruction_ = true;
   embedder_web_contents_ = NULL;
 }
 
 base::WeakPtr<BrowserPluginGuest> BrowserPluginGuest::AsWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 void BrowserPluginGuest::SetFocus(RenderWidgetHost* rwh, bool focused) {
   focused_ = focused;
+  if (!rwh)
+    return;
+
   rwh->Send(new InputMsg_SetFocus(rwh->GetRoutingID(), focused));
   if (!focused && mouse_locked_)
     OnUnlockMouse();
 
   // Restore the last seen state of text input to the view.
   RenderWidgetHostViewBase* rwhv = static_cast<RenderWidgetHostViewBase*>(
-      web_contents()->GetRenderWidgetHostView());
+      rwh->GetView());
   if (rwhv) {
     ViewHostMsg_TextInputState_Params params;
     params.type = last_text_input_type_;
     params.mode = last_input_mode_;
     params.can_compose_inline = last_can_compose_inline_;
     rwhv->TextInputStateChanged(params);
   }
 }
 
 bool BrowserPluginGuest::LockMouse(bool allowed) {
@@ skipping 582 matching lines @@
 
   // Just resize the WebContents and repaint if needed.
   if (!params.view_size.IsEmpty())
     GetWebContents()->GetView()->SizeContents(params.view_size);
   if (params.repaint)
     Send(new ViewMsg_Repaint(routing_id(), params.view_size));
 }
 
 void BrowserPluginGuest::OnSetFocus(int browser_plugin_instance_id,
                                     bool focused) {
-
-  RenderWidgetHost* rwh = web_contents()->GetRenderWidgetHostView()->
-      GetRenderWidgetHost();
+  RenderWidgetHostView* rwhv = web_contents()->GetRenderWidgetHostView();
+  RenderWidgetHost* rwh = rwhv ? rwhv->GetRenderWidgetHost() : NULL;

[lazyboy, 2014/09/12 20:56:36]

Could this be causing Shim_TestEventName failures? http://crbug.com/413618

[Fady Samuel, 2014/09/12 20:59:52]

Possibly but I'm not sure.

   SetFocus(rwh, focused);
 }
 
 void BrowserPluginGuest::OnSetEditCommandsForNextKeyEvent(
     int browser_plugin_instance_id,
     const std::vector<EditCommand>& edit_commands) {
   Send(new InputMsg_SetEditCommandsForNextKeyEvent(routing_id(),
                                                    edit_commands));
 }
 
@@ skipping 103 matching lines @@
 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
 
 }  // namespace content