diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -5991,20 +5991,29 @@ var gMissingPluginInstaller = { }, // Callback for user clicking on "preferences" link openSubmissionPrefs: function() { openAdvancedPreferences("generalTab"); }, // Callback for user clicking "submit a report" link - submitReport : function(minidumpID) { + submitReport : function(dumpIDs) { + let { pluginDumpID: pluginDumpID, browserDumpID: browserDumpID } = dumpIDs; + // The crash reporter wants a DOM element it can append an IFRAME to, // which it uses to submit a form. Let's just give it gBrowser. - this.CrashSubmit.submit(minidumpID, gBrowser, null, null); + this.CrashSubmit.submit(pluginDumpID, gBrowser, null, null); + dump("Submitted plugin crash report "+ pluginDumpID +"\n"); + if (browserDumpID) { + this.CrashSubmit.submit(browserDumpID, gBrowser, null, null); + dump("Submitted browser crash report "+ browserDumpID +"\n"); + } else { + dump("(Skipped empty browser crash report)\n"); + } }, // Callback for user clicking a "reload page" link reloadPage: function (browser) { browser.reload(); }, @@ -6151,23 +6160,25 @@ var gMissingPluginInstaller = { // are dispatched to individual plugin instances. pluginCrashed : function(subject, topic, data) { let propertyBag = subject; if (!(propertyBag instanceof Ci.nsIPropertyBag2) || !(propertyBag instanceof Ci.nsIWritablePropertyBag2)) return; #ifdef MOZ_CRASHREPORTER - let minidumpID = propertyBag.getPropertyAsAString("minidumpID"); + let pluginDumpID = propertyBag.getPropertyAsAString("pluginDumpID"); + let browserDumpID= propertyBag.getPropertyAsAString("browserDumpID"); let shouldSubmit = gCrashReporter.submitReports; let doPrompt = true; // XXX followup to get via gCrashReporter // Submit automatically when appropriate. - if (minidumpID && shouldSubmit && !doPrompt) { - this.submitReport(minidumpID); + if (pluginDumpID && shouldSubmit && !doPrompt) { + this.submitReport({ pluginDumpID: pluginDumpID, + browserDumpID: browserDumpID }); // Submission is async, so we can't easily show failure UI. propertyBag.setPropertyAsBool("submittedCrashReport", true); } #endif }, // Crashed-plugin event listener. Called for every instance of a // plugin in content. @@ -6180,17 +6191,18 @@ var gMissingPluginInstaller = { if (!(aEvent instanceof Ci.nsIDOMDataContainerEvent)) return; let submittedReport = aEvent.getData("submittedCrashReport"); let doPrompt = true; // XXX followup for .getData("doPrompt"); let submitReports = true; // XXX followup for .getData("submitReports"); let pluginName = aEvent.getData("pluginName"); - let minidumpID = aEvent.getData("minidumpID"); + let pluginDumpID = aEvent.getData("pluginDumpID"); + let browserDumpID = aEvent.getData("browserDumpID"); // We're expecting this to be a plugin. let plugin = aEvent.target; if (!(plugin instanceof Ci.nsIObjectLoadingContent)) return; // Force a style flush, so that we ensure our binding is attached. plugin.clientTop; @@ -6217,22 +6229,24 @@ var gMissingPluginInstaller = { else if (!submitReports && !doPrompt) { showClass = "msg msgNotSubmitted"; } else { // doPrompt showClass = "msg msgPleaseSubmit"; // XXX can we make the link target actually be blank? let pleaseLink = doc.getAnonymousElementByAttribute( plugin, "class", "pleaseSubmitLink"); - self.addLinkClickCallback(pleaseLink, "submitReport", minidumpID); + self.addLinkClickCallback(pleaseLink, "submitReport", + { pluginDumpID: pluginDumpID, + browserDumpID: browserDumpID }); } // If we don't have a minidumpID, we can't (or didn't) submit anything. // This can happen if the plugin is killed from the task manager. - if (!minidumpID) { + if (!pluginDumpID) { showClass = "msg msgNoCrashReport"; } let textToShow = doc.getAnonymousElementByAttribute(plugin, "class", showClass); textToShow.style.display = "block"; let bottomLinks = doc.getAnonymousElementByAttribute(plugin, "class", "msg msgBottomLinks"); bottomLinks.style.display = "block"; @@ -6248,17 +6262,17 @@ var gMissingPluginInstaller = { let observer = { QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]), observe : function(subject, topic, data) { let propertyBag = subject; if (!(propertyBag instanceof Ci.nsIPropertyBag2)) return; // Ignore notifications for other crashes. - if (propertyBag.get("minidumpID") != minidumpID) + if (propertyBag.get("minidumpID") != pluginDumpID) return; self.updateSubmissionStatus(plugin, propertyBag, data); }, handleEvent : function(event) { // Not expected to be called, just here for the closure. } } @@ -6292,32 +6306,32 @@ var gMissingPluginInstaller = { (overlay.scrollHeight - 5 > pluginRect.height); if (isObjectTooSmall) { // Hide the overlay's contents. Use visibility style, so that it // doesn't collapse down to 0x0. overlay.style.visibility = "hidden"; // If another plugin on the page was large enough to show our UI, we // don't want to show a notification bar. if (!doc.mozNoPluginCrashedNotification) - showNotificationBar(minidumpID); + showNotificationBar(pluginDumpID, browserDumpID); } else { // If a previous plugin on the page was too small and resulted in // adding a notification bar, then remove it because this plugin // instance it big enough to serve as in-content notification. hideNotificationBar(); doc.mozNoPluginCrashedNotification = true; } function hideNotificationBar() { let notification = notificationBox.getNotificationWithValue("plugin-crashed"); if (notification) notificationBox.removeNotification(notification, true); } - function showNotificationBar(minidumpID) { + function showNotificationBar(pluginDumpID, browserDumpID) { // If there's already an existing notification bar, don't do anything. let notification = notificationBox.getNotificationWithValue("plugin-crashed"); if (notification) return; // Configure the notification bar let priority = notificationBox.PRIORITY_WARNING_MEDIUM; let iconURL = "chrome://mozapps/skin/plugins/pluginGeneric-16.png"; @@ -6327,17 +6341,17 @@ var gMissingPluginInstaller = { let submitKey = gNavigatorBundle.getString("crashedpluginsMessage.submitButton.accesskey"); let buttons = [ #ifdef MOZ_CRASHREPORTER { label: submitLabel, accessKey: submitKey, popup: null, - callback: function() { gMissingPluginInstaller.submitReport(minidumpID); }, + callback: function() { gMissingPluginInstaller.submitReport({ pluginDumpID: pluginDumpID, browserDumpID: browserDumpID }); }, }, #endif { label: reloadLabel, accessKey: reloadKey, popup: null, callback: function() { browser.reload(); }, }]; diff --git a/content/base/public/nsIObjectLoadingContent.idl b/content/base/public/nsIObjectLoadingContent.idl --- a/content/base/public/nsIObjectLoadingContent.idl +++ b/content/base/public/nsIObjectLoadingContent.idl @@ -42,17 +42,17 @@ interface nsIObjectFrame; interface nsIPluginInstance; interface nsIPluginTag; interface nsIDOMElement; interface nsIDOMClientRect; /** * This interface represents a content node that loads objects. */ -[scriptable, uuid(1d89f35e-8f4b-4b79-b622-7be812a8babe)] +[scriptable, uuid(9558649a-7255-4b00-afb4-1171e9cdcead)] interface nsIObjectLoadingContent : nsISupports { const unsigned long TYPE_LOADING = 0; const unsigned long TYPE_IMAGE = 1; const unsigned long TYPE_PLUGIN = 2; const unsigned long TYPE_DOCUMENT = 3; const unsigned long TYPE_NULL = 4; @@ -121,11 +121,12 @@ interface nsIObjectLoadingContent : nsIS * If this object is in going to be printed, this method * returns the nsIObjectFrame object which should be used when * printing the plugin. The returned nsIFrame is in the original document, * not in the static clone. */ [noscript] nsIFrame getPrintFrame(); [noscript] void pluginCrashed(in nsIPluginTag pluginTag, - in AString minidumpID, + in AString pluginDumpID, + in AString browserDumpID, in boolean submittedCrashReport); }; diff --git a/content/base/src/nsObjectLoadingContent.cpp b/content/base/src/nsObjectLoadingContent.cpp --- a/content/base/src/nsObjectLoadingContent.cpp +++ b/content/base/src/nsObjectLoadingContent.cpp @@ -216,26 +216,29 @@ nsPluginErrorEvent::Run() } /** * A task for firing PluginCrashed DOM Events. */ class nsPluginCrashedEvent : public nsRunnable { public: nsCOMPtr mContent; - nsString mMinidumpID; + nsString mPluginDumpID; + nsString mBrowserDumpID; nsString mPluginName; PRBool mSubmittedCrashReport; nsPluginCrashedEvent(nsIContent* aContent, - const nsAString& aMinidumpID, + const nsAString& aPluginDumpID, + const nsAString& aBrowserDumpID, const nsAString& aPluginName, PRBool submittedCrashReport) : mContent(aContent), - mMinidumpID(aMinidumpID), + mPluginDumpID(aPluginDumpID), + mBrowserDumpID(aBrowserDumpID), mPluginName(aPluginName), mSubmittedCrashReport(submittedCrashReport) {} ~nsPluginCrashedEvent() {} NS_IMETHOD Run(); }; @@ -264,24 +267,33 @@ nsPluginCrashedEvent::Run() } event->InitEvent(NS_LITERAL_STRING("PluginCrashed"), PR_TRUE, PR_TRUE); privateEvent->SetTrusted(PR_TRUE); privateEvent->GetInternalNSEvent()->flags |= NS_EVENT_FLAG_ONLY_CHROME_DISPATCH; nsCOMPtr variant; - // add a "minidumpID" property to this event + // add a "pluginDumpID" property to this event variant = do_CreateInstance("@mozilla.org/variant;1"); if (!variant) { - NS_WARNING("Couldn't create minidumpID variant for PluginCrashed event!"); + NS_WARNING("Couldn't create pluginDumpID variant for PluginCrashed event!"); return NS_OK; } - variant->SetAsAString(mMinidumpID); - containerEvent->SetData(NS_LITERAL_STRING("minidumpID"), variant); + variant->SetAsAString(mPluginDumpID); + containerEvent->SetData(NS_LITERAL_STRING("pluginDumpID"), variant); + + // add a "browserDumpID" property to this event + variant = do_CreateInstance("@mozilla.org/variant;1"); + if (!variant) { + NS_WARNING("Couldn't create browserDumpID variant for PluginCrashed event!"); + return NS_OK; + } + variant->SetAsAString(mBrowserDumpID); + containerEvent->SetData(NS_LITERAL_STRING("browserDumpID"), variant); // add a "pluginName" property to this event variant = do_CreateInstance("@mozilla.org/variant;1"); if (!variant) { NS_WARNING("Couldn't create pluginName variant for PluginCrashed event!"); return NS_OK; } variant->SetAsAString(mPluginName); @@ -2016,31 +2028,33 @@ nsObjectLoadingContent::SetAbsoluteScree if (!frame) return NS_ERROR_NOT_AVAILABLE; return frame->SetAbsoluteScreenPosition(element, position, clip); } NS_IMETHODIMP nsObjectLoadingContent::PluginCrashed(nsIPluginTag* aPluginTag, - const nsAString& minidumpID, + const nsAString& pluginDumpID, + const nsAString& browserDumpID, PRBool submittedCrashReport) { AutoNotifier notifier(this, PR_TRUE); UnloadContent(); mFallbackReason = ePluginCrashed; nsCOMPtr thisContent = do_QueryInterface(static_cast(this)); // Note that aPluginTag in invalidated after we're called, so copy // out any data we need now. nsCAutoString pluginName; aPluginTag->GetName(pluginName); nsCOMPtr ev = new nsPluginCrashedEvent(thisContent, - minidumpID, + pluginDumpID, + browserDumpID, NS_ConvertUTF8toUTF16(pluginName), submittedCrashReport); nsresult rv = NS_DispatchToCurrentThread(ev); if (NS_FAILED(rv)) { NS_WARNING("failed to dispatch nsPluginCrashedEvent"); } return NS_OK; } diff --git a/dom/plugins/PluginModuleParent.cpp b/dom/plugins/PluginModuleParent.cpp --- a/dom/plugins/PluginModuleParent.cpp +++ b/dom/plugins/PluginModuleParent.cpp @@ -280,20 +280,18 @@ PluginModuleParent::ActorDestroy(ActorDe default: NS_ERROR("Unexpected shutdown reason for toplevel actor."); } } void PluginModuleParent::NotifyPluginCrashed() { - // FIXME/bug 544936: propagate mBrowserDumpID out to nsNPAPIPlugin - // and beyond if (mPlugin) - mPlugin->PluginCrashed(mPluginDumpID); + mPlugin->PluginCrashed(mPluginDumpID, mBrowserDumpID); } PPluginInstanceParent* PluginModuleParent::AllocPPluginInstance(const nsCString& aMimeType, const uint16_t& aMode, const nsTArray& aNames, const nsTArray& aValues, NPError* rv) diff --git a/modules/plugin/base/src/nsNPAPIPlugin.cpp b/modules/plugin/base/src/nsNPAPIPlugin.cpp --- a/modules/plugin/base/src/nsNPAPIPlugin.cpp +++ b/modules/plugin/base/src/nsNPAPIPlugin.cpp @@ -296,20 +296,21 @@ void nsNPAPIPlugin::SetPluginRefNum(short aRefNum) { mPluginRefNum = aRefNum; } #endif #ifdef MOZ_IPC void -nsNPAPIPlugin::PluginCrashed(const nsAString& dumpID) +nsNPAPIPlugin::PluginCrashed(const nsAString& pluginDumpID, + const nsAString& browserDumpID) { nsRefPtr host = dont_AddRef(nsPluginHost::GetInst()); - host->PluginCrashed(this, dumpID); + host->PluginCrashed(this, pluginDumpID, browserDumpID); } #endif namespace { #ifdef MOZ_IPC inline PRBool diff --git a/modules/plugin/base/src/nsNPAPIPlugin.h b/modules/plugin/base/src/nsNPAPIPlugin.h --- a/modules/plugin/base/src/nsNPAPIPlugin.h +++ b/modules/plugin/base/src/nsNPAPIPlugin.h @@ -87,20 +87,22 @@ public: // will prevent this from calling NP_Initialize. static nsresult CreatePlugin(const char* aFilePath, PRLibrary* aLibrary, nsIPlugin** aResult); #ifdef XP_MACOSX void SetPluginRefNum(short aRefNum); #endif #ifdef MOZ_IPC - // The IPC mechanism notifies the nsNPAPIPlugin if the plugin crashes and is - // no longer usable. dumpID is the ID of a minidump that was written, - // or empty if no minidump was written. - void PluginCrashed(const nsAString& dumpID); + // The IPC mechanism notifies the nsNPAPIPlugin if the plugin + // crashes and is no longer usable. pluginDumpID/browserDumpID are + // the IDs of respective minidumps that were written, or empty if no + // minidump was written. + void PluginCrashed(const nsAString& pluginDumpID, + const nsAString& browserDumpID); #endif protected: // Ensures that the static browser functions are properly initialized static void CheckClassInitialized(); #ifdef XP_MACOSX short mPluginRefNum; diff --git a/modules/plugin/base/src/nsPluginHost.cpp b/modules/plugin/base/src/nsPluginHost.cpp --- a/modules/plugin/base/src/nsPluginHost.cpp +++ b/modules/plugin/base/src/nsPluginHost.cpp @@ -5016,47 +5016,59 @@ NS_IMETHODIMP nsPluginHost::Notify(nsITi return NS_OK; } #endif return NS_ERROR_FAILURE; } #ifdef MOZ_IPC void -nsPluginHost::PluginCrashed(nsNPAPIPlugin* aPlugin, const nsAString& dumpID) +nsPluginHost::PluginCrashed(nsNPAPIPlugin* aPlugin, + const nsAString& pluginDumpID, + const nsAString& browserDumpID) { nsPluginTag* pluginTag = FindTagForPlugin(aPlugin); if (!pluginTag) { NS_WARNING("nsPluginTag not found in nsPluginHost::PluginCrashed"); return; } - // Notify the app's observer that a plugin crashed so it can submit a crashreport. + // Notify the app's observer that a plugin crashed so it can submit + // a crashreport. PRBool submittedCrashReport = PR_FALSE; - nsCOMPtr obsService = do_GetService("@mozilla.org/observer-service;1"); - nsCOMPtr propbag = do_CreateInstance("@mozilla.org/hash-property-bag;1"); + nsCOMPtr obsService = + do_GetService("@mozilla.org/observer-service;1"); + nsCOMPtr propbag = + do_CreateInstance("@mozilla.org/hash-property-bag;1"); if (obsService && propbag) { - propbag->SetPropertyAsAString(NS_LITERAL_STRING("minidumpID"), dumpID); - propbag->SetPropertyAsBool(NS_LITERAL_STRING("submittedCrashReport"), submittedCrashReport); + propbag->SetPropertyAsAString(NS_LITERAL_STRING("pluginDumpID"), + pluginDumpID); + propbag->SetPropertyAsAString(NS_LITERAL_STRING("browserDumpID"), + browserDumpID); + propbag->SetPropertyAsBool(NS_LITERAL_STRING("submittedCrashReport"), + submittedCrashReport); obsService->NotifyObservers(propbag, "plugin-crashed", nsnull); // see if an observer submitted a crash report. - propbag->GetPropertyAsBool(NS_LITERAL_STRING("submittedCrashReport"), &submittedCrashReport); + propbag->GetPropertyAsBool(NS_LITERAL_STRING("submittedCrashReport"), + &submittedCrashReport); } // Invalidate each nsPluginInstanceTag for the crashed plugin for (PRUint32 i = mInstanceTags.Length(); i > 0; i--) { nsPluginInstanceTag* instanceTag = mInstanceTags[i - 1]; if (instanceTag->mPluginTag == pluginTag) { - // notify the content node (nsIObjectLoadingContent) that the plugin has crashed + // notify the content node (nsIObjectLoadingContent) that the + // plugin has crashed nsCOMPtr domElement; instanceTag->mInstance->GetDOMElement(getter_AddRefs(domElement)); nsCOMPtr objectContent(do_QueryInterface(domElement)); if (objectContent) { - objectContent->PluginCrashed(pluginTag, dumpID, submittedCrashReport); + objectContent->PluginCrashed(pluginTag, pluginDumpID, browserDumpID, + submittedCrashReport); } instanceTag->mInstance->Stop(); nsPluginTag* pluginTag = instanceTag->mPluginTag; mInstanceTags.RemoveElement(instanceTag); OnPluginInstanceDestroyed(pluginTag); } diff --git a/modules/plugin/base/src/nsPluginHost.h b/modules/plugin/base/src/nsPluginHost.h --- a/modules/plugin/base/src/nsPluginHost.h +++ b/modules/plugin/base/src/nsPluginHost.h @@ -155,17 +155,19 @@ public: static nsresult GetPrompt(nsIPluginInstanceOwner *aOwner, nsIPrompt **aPrompt); static nsresult PostPluginUnloadEvent(PRLibrary* aLibrary); void AddIdleTimeTarget(nsIPluginInstanceOwner* objectFrame, PRBool isVisible); void RemoveIdleTimeTarget(nsIPluginInstanceOwner* objectFrame); #ifdef MOZ_IPC - void PluginCrashed(nsNPAPIPlugin* plugin, const nsAString& dumpID); + void PluginCrashed(nsNPAPIPlugin* plugin, + const nsAString& pluginDumpID, + const nsAString& browserDumpID); #endif nsPluginInstanceTag *FindInstanceTag(nsIPluginInstance *instance); nsPluginInstanceTag *FindInstanceTag(const char *mimetype); nsPluginInstanceTag *FindStoppedInstanceTag(const char * url); nsPluginInstanceTag *FindOldestStoppedInstanceTag(); PRUint32 StoppedInstanceTagCount(); diff --git a/modules/plugin/test/mochitest/test_crash_notify.xul b/modules/plugin/test/mochitest/test_crash_notify.xul --- a/modules/plugin/test/mochitest/test_crash_notify.xul +++ b/modules/plugin/test/mochitest/test_crash_notify.xul @@ -27,17 +27,17 @@ var testObserver = { ok(true, "Observer fired"); netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); is(topic, "plugin-crashed", "Checking correct topic"); is(data, null, "Checking null data"); ok((subject instanceof Components.interfaces.nsIPropertyBag2), "got Propbag"); ok((subject instanceof Components.interfaces.nsIWritablePropertyBag2), "got writable Propbag"); - var id = subject.getPropertyAsAString("minidumpID"); + var id = subject.getPropertyAsAString("pluginDumpID"); isnot(id, "", "got a non-empty crash id"); let directoryService = Components.classes["@mozilla.org/file/directory_service;1"]. getService(Components.interfaces.nsIProperties); let profD = directoryService.get("ProfD", Components.interfaces.nsIFile); profD.append("minidumps"); let dumpFile = profD.clone(); dumpFile.append(id + ".dmp"); diff --git a/modules/plugin/test/mochitest/test_crash_notify_no_report.xul b/modules/plugin/test/mochitest/test_crash_notify_no_report.xul --- a/modules/plugin/test/mochitest/test_crash_notify_no_report.xul +++ b/modules/plugin/test/mochitest/test_crash_notify_no_report.xul @@ -27,17 +27,17 @@ var testObserver = { ok(true, "Observer fired"); netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); is(topic, "plugin-crashed", "Checking correct topic"); is(data, null, "Checking null data"); ok((subject instanceof Components.interfaces.nsIPropertyBag2), "got Propbag"); ok((subject instanceof Components.interfaces.nsIWritablePropertyBag2), "got writable Propbag"); - var id = subject.getPropertyAsAString("minidumpID"); + var id = subject.getPropertyAsAString("pluginDumpID"); isnot(id, "", "got a non-empty crash id"); let directoryService = Components.classes["@mozilla.org/file/directory_service;1"]. getService(Components.interfaces.nsIProperties); let pendingD = directoryService.get("UAppData", Components.interfaces.nsIFile); pendingD.append("Crash Reports"); pendingD.append("pending");