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

Merge latest green inbound changeset and mozilla-central

Browse Source
This commit is contained in:
Ed Morley
2013-09-04 12:54:46 +01:00
parent 1d1d78bcb1 d6b2048b0e
commit bb2af2a8e5
101 changed files with 3274 additions and 1862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
docshell/base/nsDocShell.cpp
View File

@@ -3962,7 +3962,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;
@@ -4118,7 +4118,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)
@@ -4333,6 +4333,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