roytam1/palemoon27
1
0
Fork 0
mirror of https://github.com/roytam1/palemoon27.git synced 2026-05-29 18:18:27 +00:00
Code Issues Projects Releases Wiki Activity

Reverted "Bug 1216401: Eviscerate nsIDOMWindow, move still needed methods to nsPIDOMWindow. r=bz"

Browse Source
This commit is contained in:
roytam1
2022-12-02 23:50:39 +08:00
parent 492d5f663a
commit 3fd460890c
64 changed files with 1755 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dom/base/nsDocument.cpp
+8 -9
View File
@@ -3184,11 +3184,12 @@ nsIDocument::HasFocus(ErrorResult& rv) const
return false;
}
nsCOMPtr<nsPIDOMWindow> piWindow = do_QueryInterface(focusedWindow);
MOZ_ASSERT(piWindow);
// Are we an ancestor of the focused DOMWindow?
for (nsIDocument* currentDoc = piWindow->GetDoc(); currentDoc;
nsCOMPtr<nsIDOMDocument> domDocument;
focusedWindow->GetDocument(getter_AddRefs(domDocument));
nsCOMPtr<nsIDocument> document = do_QueryInterface(domDocument);
for (nsIDocument* currentDoc = document; currentDoc;
currentDoc = currentDoc->GetParentDocument()) {
if (currentDoc == this) {
// Yes, we are an ancestor
@@ -6949,11 +6950,9 @@ nsIDocument::GetLocation() const
return nullptr;
}
nsGlobalWindow* window = static_cast<nsGlobalWindow*>(w.get());
ErrorResult dummy;
RefPtr<nsLocation> loc = window->GetLocation(dummy);
dummy.SuppressException();
return loc.forget();
nsCOMPtr<nsIDOMLocation> loc;
w->GetLocation(getter_AddRefs(loc));
return loc.forget().downcast<nsLocation>();
}
Element*