Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 09:54:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1813132 - Fix Early Hints image Link preloads not connecting back to preloader in parent process r=emilio,necko-reviewers,valentin

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D168131
This commit is contained in:
Manuel Bucher 2023-02-09 16:35:50 +00:00
parent 11997f5951
commit 0a2efcaedf
3 changed files with 61 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
image/imgLoader.cpp
View File

@ -833,7 +833,7 @@ static nsresult NewImageChannel(
nsIReferrerInfo* aReferrerInfo, nsILoadGroup* aLoadGroup,
nsLoadFlags aLoadFlags, nsContentPolicyType aPolicyType,
nsIPrincipal* aTriggeringPrincipal, nsINode* aRequestingNode,
bool aRespectPrivacy) {
bool aRespectPrivacy, uint64_t aEarlyHintPreloaderId) {
MOZ_ASSERT(aResult);
nsresult rv;
@ -946,6 +946,11 @@ static nsresult NewImageChannel(
DebugOnly<nsresult> rv = newHttpChannel->SetReferrerInfo(aReferrerInfo);
MOZ_ASSERT(NS_SUCCEEDED(rv));
}
if (aEarlyHintPreloaderId) {
rv = httpChannelInternal->SetEarlyHintPreloaderId(aEarlyHintPreloaderId);
NS_ENSURE_SUCCESS(rv, rv);
}
}
// Image channels are loaded by default with reduced priority.
@ -1776,7 +1781,7 @@ bool imgLoader::ValidateRequestWithNewChannel(
uint64_t aInnerWindowId, nsLoadFlags aLoadFlags,
nsContentPolicyType aLoadPolicyType, imgRequestProxy** aProxyRequest,
nsIPrincipal* aTriggeringPrincipal, CORSMode aCORSMode, bool aLinkPreload,
bool* aNewChannelCreated) {
uint64_t aEarlyHintPreloaderId, bool* aNewChannelCreated) {
// now we need to insert a new channel request object in between the real
// request and the proxy that basically delays loading the image until it
// gets a 304 or figures out that this needs to be a new request
@ -1820,10 +1825,11 @@ bool imgLoader::ValidateRequestWithNewChannel(
// cache.
nsCOMPtr<nsIChannel> newChannel;
bool forcePrincipalCheck;
rv = NewImageChannel(getter_AddRefs(newChannel), &forcePrincipalCheck, aURI,
aInitialDocumentURI, aCORSMode, aReferrerInfo,
aLoadGroup, aLoadFlags, aLoadPolicyType,
aTriggeringPrincipal, aLoadingDocument, mRespectPrivacy);
rv =
NewImageChannel(getter_AddRefs(newChannel), &forcePrincipalCheck, aURI,
aInitialDocumentURI, aCORSMode, aReferrerInfo, aLoadGroup,
aLoadFlags, aLoadPolicyType, aTriggeringPrincipal,
aLoadingDocument, mRespectPrivacy, aEarlyHintPreloaderId);
if (NS_FAILED(rv)) {
return false;
}
@ -1902,7 +1908,8 @@ bool imgLoader::ValidateRequestWithNewChannel(
void imgLoader::NotifyObserversForCachedImage(
imgCacheEntry* aEntry, imgRequest* request, nsIURI* aURI,
nsIReferrerInfo* aReferrerInfo, Document* aLoadingDocument,
nsIPrincipal* aTriggeringPrincipal, CORSMode aCORSMode) {
nsIPrincipal* aTriggeringPrincipal, CORSMode aCORSMode,
uint64_t aEarlyHintPreloaderId) {
if (aEntry->HasNotified()) {
return;
}
@ -1917,11 +1924,11 @@ void imgLoader::NotifyObserversForCachedImage(
nsCOMPtr<nsIChannel> newChannel;
bool forcePrincipalCheck;
nsresult rv =
NewImageChannel(getter_AddRefs(newChannel), &forcePrincipalCheck, aURI,
nullptr, aCORSMode, aReferrerInfo, nullptr, 0,
nsIContentPolicy::TYPE_INTERNAL_IMAGE,
aTriggeringPrincipal, aLoadingDocument, mRespectPrivacy);
nsresult rv = NewImageChannel(
getter_AddRefs(newChannel), &forcePrincipalCheck, aURI, nullptr,
aCORSMode, aReferrerInfo, nullptr, 0,
nsIContentPolicy::TYPE_INTERNAL_IMAGE, aTriggeringPrincipal,
aLoadingDocument, mRespectPrivacy, aEarlyHintPreloaderId);
if (NS_FAILED(rv)) {
return;
}
@ -1946,7 +1953,7 @@ bool imgLoader::ValidateEntry(
nsLoadFlags aLoadFlags, nsContentPolicyType aLoadPolicyType,
bool aCanMakeNewChannel, bool* aNewChannelCreated,
imgRequestProxy** aProxyRequest, nsIPrincipal* aTriggeringPrincipal,
CORSMode aCORSMode, bool aLinkPreload) {
CORSMode aCORSMode, bool aLinkPreload, uint64_t aEarlyHintPreloaderId) {
LOG_SCOPE(gImgLog, "imgLoader::ValidateEntry");
// If the expiration time is zero, then the request has not gotten far enough
@ -2081,13 +2088,13 @@ bool imgLoader::ValidateEntry(
request, aURI, aInitialDocumentURI, aReferrerInfo, aLoadGroup,
aObserver, aLoadingDocument, innerWindowID, aLoadFlags, aLoadPolicyType,
aProxyRequest, aTriggeringPrincipal, aCORSMode, aLinkPreload,
aNewChannelCreated);
aEarlyHintPreloaderId, aNewChannelCreated);
}
if (!validateRequest) {
NotifyObserversForCachedImage(aEntry, request, aURI, aReferrerInfo,
aLoadingDocument, aTriggeringPrincipal,
aCORSMode);
aCORSMode, aEarlyHintPreloaderId);
}
return !validateRequest;
@ -2385,6 +2392,9 @@ nsresult imgLoader::LoadImage(
// Look in the preloaded images of loading document first.
if (StaticPrefs::network_preload() && !aLinkPreload && aLoadingDocument) {
// All Early Hints preloads are Link preloads, therefore we don't have a
// Early Hints preload here
MOZ_ASSERT(!aEarlyHintPreloaderId);
auto key =
PreloadHashKey::CreateAsImage(aURI, aTriggeringPrincipal, corsmode);
if (RefPtr<PreloaderBase> preload =
@ -2452,7 +2462,8 @@ nsresult imgLoader::LoadImage(
if (ValidateEntry(entry, aURI, aInitialDocumentURI, aReferrerInfo,
aLoadGroup, aObserver, aLoadingDocument, requestFlags,
aContentPolicyType, true, &newChannelCreated, _retval,
aTriggeringPrincipal, corsmode, aLinkPreload)) {
aTriggeringPrincipal, corsmode, aLinkPreload,
aEarlyHintPreloaderId)) {
request = entry->GetRequest();
// If this entry has no proxies, its request has no reference to the
@ -2501,7 +2512,8 @@ nsresult imgLoader::LoadImage(
rv = NewImageChannel(getter_AddRefs(newChannel), &forcePrincipalCheck, aURI,
aInitialDocumentURI, corsmode, aReferrerInfo,
aLoadGroup, requestFlags, aContentPolicyType,
aTriggeringPrincipal, aContext, mRespectPrivacy);
aTriggeringPrincipal, aContext, mRespectPrivacy,
aEarlyHintPreloaderId);
if (NS_FAILED(rv)) {
return NS_ERROR_FAILURE;
}
@ -2560,14 +2572,6 @@ nsresult imgLoader::LoadImage(
aLoadGroup);
nsresult openRes;
if (aEarlyHintPreloaderId) {
nsCOMPtr<nsIHttpChannelInternal> channelInternal =
do_QueryInterface(newChannel);
NS_ENSURE_TRUE(channelInternal != nullptr, NS_ERROR_FAILURE);
rv = channelInternal->SetEarlyHintPreloaderId(aEarlyHintPreloaderId);
NS_ENSURE_SUCCESS(rv, rv);
}
openRes = newChannel->AsyncOpen(listener);
if (NS_FAILED(openRes)) {
@ -2723,7 +2727,7 @@ nsresult imgLoader::LoadImageWithChannel(nsIChannel* channel,
if (ValidateEntry(entry, uri, nullptr, nullptr, nullptr, aObserver,
aLoadingDocument, requestFlags, policyType, false,
nullptr, nullptr, nullptr, CORS_NONE, false)) {
nullptr, nullptr, nullptr, CORS_NONE, false, 0)) {
request = entry->GetRequest();
} else {
nsCOMPtr<nsICacheInfoChannel> cacheChan(do_QueryInterface(channel));

25
image/imgLoader.h
View File

@ -356,14 +356,17 @@ class imgLoader final : public imgILoader,
private: // methods
static already_AddRefed<imgLoader> CreateImageLoader();
bool ValidateEntry(
imgCacheEntry* aEntry, nsIURI* aURI, nsIURI* aInitialDocumentURI,
nsIReferrerInfo* aReferrerInfo, nsILoadGroup* aLoadGroup,
imgINotificationObserver* aObserver,
mozilla::dom::Document* aLoadingDocument, nsLoadFlags aLoadFlags,
nsContentPolicyType aLoadPolicyType, bool aCanMakeNewChannel,
bool* aNewChannelCreated, imgRequestProxy** aProxyRequest,
nsIPrincipal* aTriggeringPrincipal, mozilla::CORSMode, bool aLinkPreload);
bool ValidateEntry(imgCacheEntry* aEntry, nsIURI* aURI,
nsIURI* aInitialDocumentURI,
nsIReferrerInfo* aReferrerInfo, nsILoadGroup* aLoadGroup,
imgINotificationObserver* aObserver,
mozilla::dom::Document* aLoadingDocument,
nsLoadFlags aLoadFlags,
nsContentPolicyType aLoadPolicyType,
bool aCanMakeNewChannel, bool* aNewChannelCreated,
imgRequestProxy** aProxyRequest,
nsIPrincipal* aTriggeringPrincipal, mozilla::CORSMode,
bool aLinkPreload, uint64_t aEarlyHintPreloaderId);
bool ValidateRequestWithNewChannel(
imgRequest* request, nsIURI* aURI, nsIURI* aInitialDocumentURI,
@ -372,14 +375,16 @@ class imgLoader final : public imgILoader,
mozilla::dom::Document* aLoadingDocument, uint64_t aInnerWindowId,
nsLoadFlags aLoadFlags, nsContentPolicyType aContentPolicyType,
imgRequestProxy** aProxyRequest, nsIPrincipal* aLoadingPrincipal,
mozilla::CORSMode, bool aLinkPreload, bool* aNewChannelCreated);
mozilla::CORSMode, bool aLinkPreload, uint64_t aEarlyHintPreloaderId,
bool* aNewChannelCreated);
void NotifyObserversForCachedImage(imgCacheEntry* aEntry, imgRequest* request,
nsIURI* aURI,
nsIReferrerInfo* aReferrerInfo,
mozilla::dom::Document* aLoadingDocument,
nsIPrincipal* aLoadingPrincipal,
mozilla::CORSMode);
mozilla::CORSMode,
uint64_t aEarlyHintPreloaderId);
// aURI may be different from imgRequest's URI in the case of blob URIs, as we
// can share requests with different URIs.
nsresult CreateNewProxyForRequest(imgRequest* aRequest, nsIURI* aURI,

19
netwerk/test/browser/browser_103_assets.js
View File

@ -12,7 +12,8 @@ const { request_count_checking } = ChromeUtils.import(
// - asset is the asset type, see early_hint_asset_html.sjs for possible values
// for the asset type fetch see test_hint_fetch due to timing issues
// - hinted: when true, the server reponds with "103 Early Hints"-header
async function test_hint_asset(testName, asset, hinted) {
// - reload: when true, the browser reloads the page after first load completed
async function test_hint_asset(testName, asset, hinted, reload) {
// reset the count
let headers = new Headers();
headers.append("X-Early-Hint-Count-Start", "");
@ -31,17 +32,25 @@ async function test_hint_asset(testName, asset, hinted) {
url: requestUrl,
waitForLoad: true,
},
async function() {}
async function() {
if (reload) {
await BrowserTestUtils.reloadTab(gBrowser.selectedTab);
}
}
);
let gotRequestCount = await fetch(
"http://example.com/browser/netwerk/test/browser/early_hint_pixel_count.sjs"
).then(response => response.json());
let numRequests = reload ? 2 : 1;
await request_count_checking(
`${testName} (${asset})`,
gotRequestCount,
hinted ? { hinted: 1, normal: 0 } : { hinted: 0, normal: 1 }
hinted
? { hinted: numRequests, normal: 0 }
: { hinted: 0, normal: numRequests }
);
}
@ -49,18 +58,21 @@ async function test_hint_asset(testName, asset, hinted) {
add_task(async function test_103_asset_image() {
await test_hint_asset("test_103_asset_normal", "image", false);
await test_hint_asset("test_103_asset_hinted", "image", true);
await test_hint_asset("test_103_asset_hinted", "image", true, true);
});
// preload css
add_task(async function test_103_asset_style() {
await test_hint_asset("test_103_asset_normal", "style", false);
await test_hint_asset("test_103_asset_hinted", "style", true);
await test_hint_asset("test_103_asset_hinted", "style", true, true);
});
// preload javascript
add_task(async function test_103_asset_javascript() {
await test_hint_asset("test_103_asset_normal", "script", false);
await test_hint_asset("test_103_asset_hinted", "script", true);
await test_hint_asset("test_103_asset_hinted", "script", true, true);
});
// preload javascript module
@ -75,6 +87,7 @@ add_task(async function test_103_asset_module() {
add_task(async function test_103_asset_font() {
await test_hint_asset("test_103_asset_normal", "font", false);
await test_hint_asset("test_103_asset_hinted", "font", true);
await test_hint_asset("test_103_asset_hinted", "font", true, true);
});
// - testName is just there to be printed during Asserts when failing