icecat: update upstream v128.13.0-1gnu1
This commit is contained in:
parent
a8d305c270
commit
0cdda4f34e
51 changed files with 5487 additions and 4614 deletions
|
|
@ -280,16 +280,27 @@ nsSyncLoader::GetInterface(const nsIID& aIID, void** aResult) {
|
|||
|
||||
/* static */
|
||||
nsresult nsSyncLoadService::LoadDocument(
|
||||
nsIURI* aURI, nsContentPolicyType aContentPolicyType,
|
||||
nsIURI* aURI, nsContentPolicyType aContentPolicyType, Document* aLoaderDoc,
|
||||
nsIPrincipal* aLoaderPrincipal, nsSecurityFlags aSecurityFlags,
|
||||
nsILoadGroup* aLoadGroup, nsICookieJarSettings* aCookieJarSettings,
|
||||
bool aForceToXML, ReferrerPolicy aReferrerPolicy, Document** aResult) {
|
||||
MOZ_ASSERT(!!aLoaderPrincipal != !!aLoaderDoc);
|
||||
|
||||
nsCOMPtr<nsIChannel> channel;
|
||||
nsresult rv =
|
||||
NS_NewChannel(getter_AddRefs(channel), aURI, aLoaderPrincipal,
|
||||
aSecurityFlags, aContentPolicyType, aCookieJarSettings,
|
||||
nullptr, // PerformanceStorage
|
||||
aLoadGroup);
|
||||
nsresult rv;
|
||||
if (aLoaderDoc) {
|
||||
MOZ_ASSERT(!aCookieJarSettings);
|
||||
rv = NS_NewChannel(getter_AddRefs(channel), aURI, aLoaderDoc,
|
||||
aSecurityFlags, aContentPolicyType,
|
||||
nullptr, // PerformanceStorage
|
||||
aLoadGroup);
|
||||
} else {
|
||||
rv = NS_NewChannel(getter_AddRefs(channel), aURI, aLoaderPrincipal,
|
||||
aSecurityFlags, aContentPolicyType, aCookieJarSettings,
|
||||
nullptr, // PerformanceStorage
|
||||
aLoadGroup);
|
||||
}
|
||||
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
if (!aForceToXML) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue