Backed out 6 changesets (bug 1353867) for nsDocShell.cpp failures CLOSED TREE
Backed out changeset aa9b106b15d9 (bug1353867) Backed out changeset 8c05f4d3f7ad (bug1353867) Backed out changeset 00869bed4121 (bug1353867) Backed out changeset 700aeb906fd2 (bug1353867) Backed out changeset 8b60851b93da (bug1353867) Backed out changeset ebdf4531b3bd (bug1353867)
This commit is contained in:
@@ -1138,7 +1138,7 @@ void nsHTMLDocument::SetCookie(const nsAString& aCookie, ErrorResult& rv) {
|
||||
}
|
||||
}
|
||||
|
||||
mozilla::dom::Nullable<mozilla::dom::WindowProxyHolder> nsHTMLDocument::Open(
|
||||
already_AddRefed<nsPIDOMWindowOuter> nsHTMLDocument::Open(
|
||||
JSContext* /* unused */, const nsAString& aURL, const nsAString& aName,
|
||||
const nsAString& aFeatures, bool aReplace, ErrorResult& rv) {
|
||||
MOZ_ASSERT(nsContentUtils::CanCallerAccess(this),
|
||||
@@ -1159,10 +1159,7 @@ mozilla::dom::Nullable<mozilla::dom::WindowProxyHolder> nsHTMLDocument::Open(
|
||||
nsCOMPtr<nsPIDOMWindowOuter> newWindow;
|
||||
// XXXbz We ignore aReplace for now.
|
||||
rv = win->OpenJS(aURL, aName, aFeatures, getter_AddRefs(newWindow));
|
||||
if (!newWindow) {
|
||||
return nullptr;
|
||||
}
|
||||
return WindowProxyHolder(newWindow->GetBrowsingContext());
|
||||
return newWindow.forget();
|
||||
}
|
||||
|
||||
already_AddRefed<nsIDocument> nsHTMLDocument::Open(
|
||||
|
||||
Reference in New Issue
Block a user