corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 899348 - Dispatch an event when an out-of-process browser crashes and display an error page when that occurs. r=bz

Browse Source
This commit is contained in:
Felipe Gomes
2013-09-03 19:11:22 -03:00
parent 2bcf75be48
commit cbb93833f2
8 changed files with 56 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
docshell/base/nsDocShell.cpp
View File

@@ -3982,7 +3982,7 @@ bool
nsDocShell::IsPrintingOrPP(bool aDisplayErrorDialog)
{
if (mIsPrintingOrPP && aDisplayErrorDialog) {
DisplayLoadError(NS_ERROR_DOCUMENT_IS_PRINTMODE, nullptr, nullptr);
DisplayLoadError(NS_ERROR_DOCUMENT_IS_PRINTMODE, nullptr, nullptr, nullptr);
}
return mIsPrintingOrPP;
@@ -4138,7 +4138,7 @@ nsDocShell::LoadURI(const PRUnichar * aURI,
// what happens
if (NS_ERROR_MALFORMED_URI == rv) {
DisplayLoadError(rv, uri, aURI);
DisplayLoadError(rv, uri, aURI, nullptr);
}
if (NS_FAILED(rv) || !uri)
@@ -4353,6 +4353,15 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI *aURI,
bucketId);
cssClass.AssignLiteral("blacklist");
} else if (NS_ERROR_CONTENT_CRASHED == aError) {
errorPage.AssignLiteral("tabcrashed");
error.AssignLiteral("tabcrashed");
nsCOMPtr<EventTarget> handler = mChromeEventHandler;
if (handler) {
nsCOMPtr<Element> element = do_QueryInterface(handler);
element->GetAttribute(NS_LITERAL_STRING("crashedPageTitle"), messageStr);
}
}
else {
// Errors requiring simple formatting