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 119 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 108 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()) {
     BrowserPluginManager::Get()->Send(new BrowserPluginHostMsg_UpdateRect_ACK(
         render_view_->GetRoutingID(),
         instance_id_,
         message_id,
         gfx::Size(width(), height())));
     return;
   }
 
+  // If we're getting new pixels then a guest is available again.
+  guest_crashed_ = false;

[Charlie Reis, 2012/10/12 04:10:25]

Wouldn't DidNavigate/LoadCommit be a better place for this?  If any page
commits, we know we're no longer crashed.  (That seems closer to the invariant I
would expect, as well as how the browser process handles it, rather than
inferring it from graphical updates.)

[Fady Samuel, 2012/10/12 17:33:06]

Done.

   float backing_store_scale_factor =
       backing_store_.get() ? backing_store_->GetScaleFactor() : 1.0f;
 
   if (params.is_resize_ack ||
       backing_store_scale_factor != params.scale_factor) {
     resize_pending_ = !params.is_resize_ack;
     backing_store_.reset(
         new BrowserPluginBackingStore(gfx::Size(width(), height()),
                                       params.scale_factor));
   }
@@ skipping 459 matching lines @@
                                                  void* notify_data) {
 }
 
 void BrowserPlugin::didFailLoadingFrameRequest(
     const WebKit::WebURL& url,
     void* notify_data,
     const WebKit::WebURLError& error) {
 }
 
 }  // namespace content