Browser Plugin: Navigating to the same URL after crash should load a new guest

content/renderer/browser_plugin/browser_plugin_bindings.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_bindings.h"
 
 #include <cstdlib>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 691 matching lines @@
   virtual bool GetProperty(BrowserPluginBindings* bindings,
                            NPVariant* result) OVERRIDE {
     std::string src = bindings->instance()->GetSrcAttribute();
     return StringToNPVariant(src, result);
   }
   virtual bool SetProperty(BrowserPluginBindings* bindings,
                            NPObject* np_obj,
                            const NPVariant* variant) OVERRIDE {
     std::string new_value = StringFromNPVariant(*variant);
     std::string old_value = bindings->instance()->GetSrcAttribute();
-    if (old_value != new_value && !new_value.empty()) {
+    bool guest_crashed = bindings->instance()->guest_crashed();
+    if ((old_value != new_value) || guest_crashed) {
+      if (new_value.empty()) {

[lazyboy, 2013/02/11 18:23:18]

Just noting: We used to have this check (setting empty src) on shim before?

[Fady Samuel, 2013/02/12 20:44:41]

I don't recall. Right now 'src' is treated like any other attribute in the shim.

+        // Remove the DOM attribute to trigger <webview>'s mutation observer
+        // when it is restored to its original value again.
+        bindings->instance()->RemoveDOMAttribute(name());
+        new_value = old_value;
+      }
+      // If the new value was empty then we're effectively resetting the
+      // attribute to the old value here. This will be picked up by <webview>'s
+      // mutation observer and will restore the src attribute after it has been
+      // removed.
       UpdateDOMAttribute(bindings, new_value);
       std::string error_message;
       if (!bindings->instance()->ParseSrcAttribute(&error_message)) {
         WebBindings::setException(
             np_obj, static_cast<const NPUTF8 *>(error_message.c_str()));
         // Reset to old value on error.
         UpdateDOMAttribute(bindings, old_value);
         return false;
       }
     }
     return true;
   }
   virtual void RemoveProperty(BrowserPluginBindings* bindings,
                               NPObject* np_obj) OVERRIDE {
+    std::string old_value = bindings->instance()->GetSrcAttribute();
+    // Remove the DOM attribute to trigger the mutation observer when it is
+    // restored to its original value again.
     bindings->instance()->RemoveDOMAttribute(name());
+    UpdateDOMAttribute(bindings, old_value);
   }
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginPropertyBindingSrc);
 };
 
 
 // BrowserPluginBindings ------------------------------------------------------
 
 BrowserPluginBindings::BrowserPluginNPObject::BrowserPluginNPObject() {
 }
@@ skipping 102 matching lines @@
   for (PropertyBindingList::iterator iter = property_bindings_.begin();
        iter != property_bindings_.end();
        ++iter) {
     if ((*iter)->MatchesName(name))
       return (*iter)->GetProperty(this, result);
   }
   return false;
 }
 
 }  // namespace content