зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1310127 - Part 13: Use MOZ_MUST_USE in netwerk/protocol/http r=heycam
MozReview-Commit-ID: 9qpbe86biXz --HG-- extra : rebase_source : f76dde754eea0f253f7c2b16fdb1067623617291
This commit is contained in:
Родитель
35599f0d33
Коммит
4110645152
|
@ -617,20 +617,25 @@ FontFaceSet::StartLoad(gfxUserFontEntry* aUserFontEntry,
|
|||
|
||||
nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(channel));
|
||||
if (httpChannel) {
|
||||
httpChannel->SetReferrerWithPolicy(aFontFaceSrc->mReferrer,
|
||||
mDocument->GetReferrerPolicy());
|
||||
rv = httpChannel->SetReferrerWithPolicy(aFontFaceSrc->mReferrer,
|
||||
mDocument->GetReferrerPolicy());
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
nsAutoCString accept("application/font-woff;q=0.9,*/*;q=0.8");
|
||||
if (Preferences::GetBool(GFX_PREF_WOFF2_ENABLED)) {
|
||||
accept.Insert(NS_LITERAL_CSTRING("application/font-woff2;q=1.0,"), 0);
|
||||
}
|
||||
httpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Accept"),
|
||||
accept, false);
|
||||
rv = httpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Accept"),
|
||||
accept, false);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
// For WOFF and WOFF2, we should tell servers/proxies/etc NOT to try
|
||||
// and apply additional compression at the content-encoding layer
|
||||
if (aFontFaceSrc->mFormatFlags & (gfxUserFontSet::FLAG_FORMAT_WOFF |
|
||||
gfxUserFontSet::FLAG_FORMAT_WOFF2)) {
|
||||
httpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Accept-Encoding"),
|
||||
NS_LITERAL_CSTRING("identity"), false);
|
||||
rv = httpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Accept-Encoding"),
|
||||
NS_LITERAL_CSTRING("identity"), false);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
}
|
||||
}
|
||||
nsCOMPtr<nsISupportsPriority> priorityChannel(do_QueryInterface(channel));
|
||||
|
|
|
@ -1680,17 +1680,22 @@ Loader::LoadSheet(SheetLoadData* aLoadData,
|
|||
nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(channel));
|
||||
if (httpChannel) {
|
||||
// Send a minimal Accept header for text/css
|
||||
httpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Accept"),
|
||||
NS_LITERAL_CSTRING("text/css,*/*;q=0.1"),
|
||||
false);
|
||||
rv = httpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Accept"),
|
||||
NS_LITERAL_CSTRING("text/css,*/*;q=0.1"),
|
||||
false);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
nsCOMPtr<nsIURI> referrerURI = aLoadData->GetReferrerURI();
|
||||
if (referrerURI)
|
||||
httpChannel->SetReferrerWithPolicy(referrerURI,
|
||||
aLoadData->mSheet->GetReferrerPolicy());
|
||||
if (referrerURI) {
|
||||
rv = httpChannel->SetReferrerWithPolicy(referrerURI,
|
||||
aLoadData->mSheet->GetReferrerPolicy());
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIHttpChannelInternal> internalChannel = do_QueryInterface(httpChannel);
|
||||
if (internalChannel) {
|
||||
internalChannel->SetIntegrityMetadata(sriMetadata.GetIntegrityString());
|
||||
rv = internalChannel->SetIntegrityMetadata(sriMetadata.GetIntegrityString());
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
}
|
||||
|
||||
// Set the initiator type
|
||||
|
|
Загрузка…
Ссылка в новой задаче