Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Unified Diff: content/renderer/browser_plugin/browser_plugin.cc

Issue 12224094: Browser Plugin: Navigating to the same URL after crash should load a new guest (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed nits + Merged with ToT Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/browser_plugin/browser_plugin.cc
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index 3a5c1e830076991f4521d557f502f0301b399272..99747c6b425b4f247276c33142d8670bbc553ee9 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -413,6 +413,11 @@ void BrowserPlugin::OnGuestContentWindowReady(int instance_id,
}
void BrowserPlugin::OnGuestGone(int instance_id, int process_id, int status) {
+ // Set the BrowserPlugin in a crashed state before firing event listeners so
+ // that operations on the BrowserPlugin within listeners are aware that
+ // BrowserPlugin is in a crashed state.
+ guest_crashed_ = true;
+
// We fire the event listeners before painting the sad graphic to give the
// developer an opportunity to display an alternative overlay image on crash.
std::string termination_status = TerminationStatusToString(
@@ -427,7 +432,6 @@ void BrowserPlugin::OnGuestGone(int instance_id, int process_id, int status) {
// but leave other member variables valid below.
TriggerEvent(browser_plugin::kEventExit, &props);
- guest_crashed_ = true;
// We won't paint the contents of the current backing store again so we might
// as well toss it out and save memory.
backing_store_.reset();
@@ -468,9 +472,9 @@ void BrowserPlugin::OnLoadCommit(
// If the guest has just committed a new navigation then it is no longer
// crashed.
guest_crashed_ = false;
- if (params.is_top_level) {
+ if (params.is_top_level)
UpdateDOMAttribute(browser_plugin::kAttributeSrc, params.url.spec());
- }
+
guest_process_id_ = params.process_id;
guest_route_id_ = params.route_id;
current_nav_entry_index_ = params.current_entry_index;
@@ -797,7 +801,7 @@ void BrowserPlugin::Go(int relative_index) {
}
void BrowserPlugin::TerminateGuest() {
- if (!navigate_src_sent_)
+ if (!navigate_src_sent_ || guest_crashed_)
return;
browser_plugin_manager()->Send(
new BrowserPluginHostMsg_TerminateGuest(render_view_routing_id_,
« no previous file with comments | « content/renderer/browser_plugin/browser_plugin.h ('k') | content/renderer/browser_plugin/browser_plugin_bindings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698