mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +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:
@@ -3184,12 +3184,11 @@ nsIDocument::HasFocus(ErrorResult& rv) const
|
||||
return false;
|
||||
}
|
||||
|
||||
// Are we an ancestor of the focused DOMWindow?
|
||||
nsCOMPtr<nsIDOMDocument> domDocument;
|
||||
focusedWindow->GetDocument(getter_AddRefs(domDocument));
|
||||
nsCOMPtr<nsIDocument> document = do_QueryInterface(domDocument);
|
||||
nsCOMPtr<nsPIDOMWindow> piWindow = do_QueryInterface(focusedWindow);
|
||||
MOZ_ASSERT(piWindow);
|
||||
|
||||
for (nsIDocument* currentDoc = document; currentDoc;
|
||||
// Are we an ancestor of the focused DOMWindow?
|
||||
for (nsIDocument* currentDoc = piWindow->GetDoc(); currentDoc;
|
||||
currentDoc = currentDoc->GetParentDocument()) {
|
||||
if (currentDoc == this) {
|
||||
// Yes, we are an ancestor
|
||||
@@ -6950,9 +6949,11 @@ nsIDocument::GetLocation() const
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIDOMLocation> loc;
|
||||
w->GetLocation(getter_AddRefs(loc));
|
||||
return loc.forget().downcast<nsLocation>();
|
||||
nsGlobalWindow* window = static_cast<nsGlobalWindow*>(w.get());
|
||||
ErrorResult dummy;
|
||||
RefPtr<nsLocation> loc = window->GetLocation(dummy);
|
||||
dummy.SuppressException();
|
||||
return loc.forget();
|
||||
}
|
||||
|
||||
Element*
|
||||
|
||||
Reference in New Issue
Block a user