Backed out 4 changesets (bug 1521808) for build bustage. CLOSED TREE
Backed out changeset 80aeea5f7abe (bug 1521808) Backed out changeset c8c151d92c03 (bug 1521808) Backed out changeset cc0a5c7dabb4 (bug 1521808) Backed out changeset 8d5174a560fa (bug 1521808)
This commit is contained in:
@@ -2232,11 +2232,6 @@ HttpBaseChannel::SwitchProcessTo(mozilla::dom::Promise* aTabParent,
|
||||
return NS_ERROR_NOT_AVAILABLE;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
HttpBaseChannel::HasCrossOriginOpenerPolicyMismatch(bool* aMismatch) {
|
||||
return NS_ERROR_NOT_AVAILABLE;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
HttpBaseChannel::UpgradeToSecure() {
|
||||
// Upgrades are handled internally between http-on-modify-request and
|
||||
@@ -2331,16 +2326,6 @@ HttpBaseChannel::SetTopWindowURIIfUnknown(nsIURI* aTopWindowURI) {
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
HttpBaseChannel::SetTopWindowPrincipal(nsIPrincipal* aTopWindowPrincipal) {
|
||||
if (!aTopWindowPrincipal) {
|
||||
return NS_ERROR_INVALID_ARG;
|
||||
}
|
||||
|
||||
mTopWindowPrincipal = aTopWindowPrincipal;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
HttpBaseChannel::GetTopWindowURI(nsIURI** aTopWindowURI) {
|
||||
nsCOMPtr<nsIURI> uriBeingLoaded =
|
||||
@@ -2379,18 +2364,6 @@ nsresult HttpBaseChannel::GetTopWindowURI(nsIURI* aURIBeingLoaded,
|
||||
return rv;
|
||||
}
|
||||
|
||||
nsresult HttpBaseChannel::GetTopWindowPrincipal(
|
||||
nsIPrincipal** aTopWindowPrincipal) {
|
||||
nsCOMPtr<mozIThirdPartyUtil> util = services::GetThirdPartyUtil();
|
||||
nsCOMPtr<mozIDOMWindowProxy> win;
|
||||
nsresult rv =
|
||||
util->GetTopWindowForChannel(this, nullptr, getter_AddRefs(win));
|
||||
if (NS_FAILED(rv)) {
|
||||
return rv;
|
||||
}
|
||||
return util->GetPrincipalFromWindow(win, getter_AddRefs(mTopWindowPrincipal));
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
HttpBaseChannel::GetDocumentURI(nsIURI** aDocumentURI) {
|
||||
NS_ENSURE_ARG_POINTER(aDocumentURI);
|
||||
|
||||
Reference in New Issue
Block a user