Bug 1128454 - When plugin bridging fails, propagate the error back to the content process without aborting tabs. r=billm
authorJim Mathies <jmathies@mozilla.com>
Mon, 20 Jul 2015 10:20:15 -0500
changeset 253940 d82fc1a3328be4ade6b23933e26f467f4e37dcda
parent 253939 9a073bb6c768f59e545fb1830c7e70b14f2fd836
child 253941 f659ec819bf6ecdeb04da10b00f3404ef6768a09
push id62605
push userryanvm@gmail.com
push dateTue, 21 Jul 2015 19:38:52 +0000
treeherdermozilla-inbound@d82fc1a3328b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbillm
bugs1128454
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1128454 - When plugin bridging fails, propagate the error back to the content process without aborting tabs. r=billm
dom/plugins/ipc/PluginModuleParent.cpp
--- a/dom/plugins/ipc/PluginModuleParent.cpp
+++ b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -125,26 +125,16 @@ mozilla::plugins::SetupBridge(uint32_t a
     }
     chromeParent->SetContentParent(aContentParent);
     if (!aForceBridgeNow && chromeParent->IsStartingAsync() &&
         PluginModuleChromeParent::DidInstantiate()) {
         // We'll handle the bridging asynchronously
         return true;
     }
     *rv = PPluginModule::Bridge(aContentParent, chromeParent);
-    if (NS_FAILED(*rv)) {
-#if defined(MOZ_CRASHREPORTER)
-        // We are going to abort due to the failure, lets note the cause
-        // in the report for diagnosing.
-        nsAutoCString error;
-        error.AppendPrintf("%X %d", *rv, chromeParent->GetIPCChannel()->GetChannelState__TotallyRacy());
-        CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("BridgePluginError"), error);
-#endif
-      return false;
-    }
     return true;
 }
 
 #ifdef MOZ_CRASHREPORTER_INJECTOR
 
 /**
  * Use for executing CreateToolhelp32Snapshot off main thread
  */