mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- Bug 1172870 - Implement service workers clients.openWindow for desktop (non-e10s). r=baku,smaug (b236bb7abe) - Bug 1188545 - Prevent service workers from being terminated while checking if the script evaluation was successful. r=nsm (c92e4159f4) - Bug 1214300 - AsyncErrorReporter doesn't use JSRuntime param., r=smaug (91534bd3e3) - Bug 1202001 - Log errors emitted during service worker lifecycle events to the Web Console; r=bkelly (a28967cbc7) - Bug 1189673 - Set FetchEvent.request.headers' guard to immutable before dispatching the FetchEvent; r=bkelly (9e49512912) - Bug 1215140 P7 Remove old service worker interception logging. r=bz (ecbf828102) - Bug 1215140 P8 Remove now unnecessary interception values from ErrorList.h. r=bz (1fa026bef7) - Bug 1215140 P9 Provide file and line number when FetchEvent.preventDefault() cancels a request. r=bz (fb9bc6ba03) - Bug 1215140 P10 Avoid AddRef'ing the nsIChannel OMT. r=bz (cf82339f63) - Bug 1216401: Eviscerate nsIDOMWindow, move still needed methods to nsPIDOMWindow. r=bz (9bd51a95eb) - Bug 1172870 - Part 1 - Move PBrowser::CreateWindow to PContent. r=smaug (f91e410853) - Bug 1172870 - Part 2 - Enable ServiceWorkerClients::OpenWindow on e10s desktop. r=smaug (aefff3b138) - Bug 1222097 - Resolve the openWindow URL using the service worker URL as the base URL. r=bkelly (6ebd7fe6c9) - Bug 1172870 - Part 3 - Fix openWindow mochitest to work on e10s. r=smaug (9652eead7a) - Bug 1191724, ensure private browser flag is set on docshell early enough, r=fabrice (38f909e960) - Bug 1189964 - Fix a crash handling drags on dying windows. r=smaug (3b7bf446d7) - misspatch of 1162700 (ceb869512f)
This commit is contained in:
@@ -5011,17 +5011,7 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI* aURI,
|
||||
error.AssignLiteral("corruptedContentError");
|
||||
break;
|
||||
case NS_ERROR_INTERCEPTION_FAILED:
|
||||
case NS_ERROR_OPAQUE_INTERCEPTION_DISABLED:
|
||||
case NS_ERROR_BAD_OPAQUE_INTERCEPTION_REQUEST_MODE:
|
||||
case NS_ERROR_INTERCEPTED_ERROR_RESPONSE:
|
||||
case NS_ERROR_INTERCEPTED_USED_RESPONSE:
|
||||
case NS_ERROR_CLIENT_REQUEST_OPAQUE_INTERCEPTION:
|
||||
case NS_ERROR_BAD_OPAQUE_REDIRECT_INTERCEPTION:
|
||||
case NS_ERROR_INTERCEPTION_CANCELED:
|
||||
case NS_ERROR_REJECTED_RESPONSE_INTERCEPTION:
|
||||
// ServiceWorker intercepted request, but something went wrong.
|
||||
nsContentUtils::MaybeReportInterceptionErrorToConsole(GetDocument(),
|
||||
aError);
|
||||
error.AssignLiteral("corruptedContentError");
|
||||
break;
|
||||
default:
|
||||
@@ -7508,7 +7498,7 @@ nsDocShell::EndPageLoad(nsIWebProgress* aProgress,
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
thisWindow->GetFrameElement(getter_AddRefs(frameElement));
|
||||
frameElement = thisWindow->GetFrameElement();
|
||||
if (!frameElement) {
|
||||
return NS_OK;
|
||||
}
|
||||
@@ -7701,15 +7691,7 @@ nsDocShell::EndPageLoad(nsIWebProgress* aProgress,
|
||||
aStatus == NS_ERROR_UNWANTED_URI ||
|
||||
aStatus == NS_ERROR_UNSAFE_CONTENT_TYPE ||
|
||||
aStatus == NS_ERROR_REMOTE_XUL ||
|
||||
aStatus == NS_ERROR_OFFLINE ||
|
||||
aStatus == NS_ERROR_INTERCEPTION_FAILED ||
|
||||
aStatus == NS_ERROR_OPAQUE_INTERCEPTION_DISABLED ||
|
||||
aStatus == NS_ERROR_BAD_OPAQUE_INTERCEPTION_REQUEST_MODE ||
|
||||
aStatus == NS_ERROR_INTERCEPTED_ERROR_RESPONSE ||
|
||||
aStatus == NS_ERROR_INTERCEPTED_USED_RESPONSE ||
|
||||
aStatus == NS_ERROR_CLIENT_REQUEST_OPAQUE_INTERCEPTION ||
|
||||
aStatus == NS_ERROR_INTERCEPTION_CANCELED ||
|
||||
aStatus == NS_ERROR_REJECTED_RESPONSE_INTERCEPTION ||
|
||||
NS_ERROR_GET_MODULE(aStatus) == NS_ERROR_MODULE_SECURITY) {
|
||||
// Errors to be shown for any frame
|
||||
DisplayLoadError(aStatus, url, nullptr, aChannel);
|
||||
|
||||
Reference in New Issue
Block a user