Browser Plugin: More robust recovery from guest crash

content/renderer/browser_plugin/browser_plugin.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/renderer/browser_plugin/browser_plugin.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #if defined (OS_WIN)
 #include "base/sys_info.h"
@@ skipping 121 matching lines @@
     // such a message, subsequent SetSrcAttribute() calls must always send
     // NavigateGuest messages to the embedder (even if |src| is empty), so
     // resize works correctly for all cases (e.g. The embedder can reset the
     // guest's |src| to empty value, resize and then set the |src| to a
     // non-empty value).
     // Additionally, once this instance has navigated, the storage partition
     // cannot be changed, so this value is used for enforcing this.
     navigate_src_sent_ = true;
   }
   src_ = src;
-  guest_crashed_ = false;
 }
 
 std::string BrowserPlugin::GetPartitionAttribute() const {
   std::string value;
   if (persist_storage_)
     value.append(kPersistPrefix);
 
   value.append(storage_partition_id_);
   return value;
 }
@@ skipping 117 matching lines @@
   if (!navigate_src_sent_)
     return;
   BrowserPluginManager::Get()->Send(
       new BrowserPluginHostMsg_Stop(render_view_->GetRoutingID(),
                                     instance_id_));
 }
 
 void BrowserPlugin::Reload() {
   if (!navigate_src_sent_)
     return;
-  guest_crashed_ = false;
   BrowserPluginManager::Get()->Send(
       new BrowserPluginHostMsg_Reload(render_view_->GetRoutingID(),
                                       instance_id_));
 }
 
 void BrowserPlugin::UpdateRect(
     int message_id,
     const BrowserPluginMsg_UpdateRect_Params& params) {
   if (width() != params.view_size.width() ||
       height() != params.view_size.height()) {
@@ skipping 59 matching lines @@
   EventListeners::iterator it = listeners.begin();
   for (; it != listeners.end(); ++it) {
     WebKit::WebFrame* frame = plugin.document().frame();
     if (frame)
       frame->callFunctionEvenIfScriptDisabled(*it, v8::Object::New(), 0, NULL);
   }
 }
 
 void BrowserPlugin::DidNavigate(
     const BrowserPluginMsg_DidNavigate_Params& params) {
+  // If the guest has just committed a new navigation then it is no longer
+  // crashed.
+  guest_crashed_ = false;
   src_ = params.url.spec();
   process_id_ = params.process_id;
   current_nav_entry_index_ = params.current_entry_index;
   nav_entry_count_ = params.entry_count;
 
   if (!HasListeners(kNavigationEventName))
     return;
 
   WebKit::WebElement plugin = container()->element();
   v8::HandleScope handle_scope;
@@ skipping 268 matching lines @@
   params->resize_pending = resize_pending_;
   params->scale_factor = GetDeviceScaleFactor();
 
   if (navigate_src_sent_) {
     BrowserPluginManager::Get()->Send(new BrowserPluginHostMsg_ResizeGuest(
         render_view_->GetRoutingID(),
         instance_id_,
         *params));
     resize_pending_ = true;
   } else {
-    // Until an actual navigation occurs, there is no browser side embedder
+    // Until an actual navigation occurs, there is no browser-side embedder
     // present to notify about geometry updates. In this case, after we've
     // updated the BrowserPlugin's state we are done and we do not send a resize
     // message to the browser.
     pending_resize_params_.reset(params.release());
   }
   if (damage_buffer_)
     FreeDamageBuffer();
   damage_buffer_ = new_damage_buffer;
 }
 
 void BrowserPlugin::FreeDamageBuffer() {
   DCHECK(damage_buffer_);
 #if defined(OS_MACOSX)
-  // We don't need to (nor we should) send ViewHostMsg_FreeTransportDIB
+  // We don't need to (nor should we) send ViewHostMsg_FreeTransportDIB
   // message to the browser to free the damage buffer since we manage the
   // damage buffer ourselves.
   delete damage_buffer_;
 #else
   RenderProcess::current()->FreeTransportDIB(damage_buffer_);
   damage_buffer_ = NULL;
 #endif
 }
 
 BrowserPluginHostMsg_ResizeGuest_Params*
@@ skipping 123 matching lines @@
                                                  void* notify_data) {
 }
 
 void BrowserPlugin::didFailLoadingFrameRequest(
     const WebKit::WebURL& url,
     void* notify_data,
     const WebKit::WebURLError& error) {
 }
 
 }  // namespace content