Skip to content

GitLab

T
tangled
Commit 03168d86 authored by Kunihiko Sakamoto's avatar Kunihiko Sakamoto Committed by Commit Bot
Browse files
Options

Update sxg version of prefetch accept: header to b2 

and add a link to the mime-type definition.

Bug: 874752,876968
Change-Id: I63be125a714e716fa83becc23e812db453fa1a9d
Reviewed-on: https://chromium-review.googlesource.com/1188163Reviewed-by: default avatarYoav Weiss <yoav@yoav.ws>
Reviewed-by: default avatarKouhei Ueno <kouhei@chromium.org>
Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Kunihiko Sakamoto <ksakamoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585770}
parent 38e84f69
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
content/browser/loader/prefetch_browsertest.cc
View file @ 03168d86
...@@ -351,9 +351,9 @@ IN_PROC_BROWSER_TEST_P(PrefetchBrowserTest, WebPackageWithPreload) { ...@@ -351,9 +351,9 @@ IN_PROC_BROWSER_TEST_P(PrefetchBrowserTest, WebPackageWithPreload) {
RegisterResponse( RegisterResponse(
target_sxg, target_sxg,
// We mock the SignedExchangeHandler, so just return a HTML content // We mock the SignedExchangeHandler, so just return a HTML content
// as "application/signed-exchange;v=b1". // as "application/signed-exchange;v=b2".
ResponseEntry("<head><title>Prefetch Target (SXG)</title></head>", ResponseEntry("<head><title>Prefetch Target (SXG)</title></head>",
"application/signed-exchange;v=b1")); "application/signed-exchange;v=b2"));
RegisterResponse(preload_url_in_sxg, RegisterResponse(preload_url_in_sxg,
ResponseEntry("function foo() {}", "text/javascript")); ResponseEntry("function foo() {}", "text/javascript"));
...@@ -388,7 +388,7 @@ IN_PROC_BROWSER_TEST_P(PrefetchBrowserTest, WebPackageWithPreload) { ...@@ -388,7 +388,7 @@ IN_PROC_BROWSER_TEST_P(PrefetchBrowserTest, WebPackageWithPreload) {
EXPECT_TRUE(CheckPrefetchURLLoaderCountIfSupported(1)); EXPECT_TRUE(CheckPrefetchURLLoaderCountIfSupported(1));
if (base::FeatureList::IsEnabled(features::kSignedHTTPExchange)) if (base::FeatureList::IsEnabled(features::kSignedHTTPExchange))
EXPECT_EQ(prefetch_headers["Accept"], EXPECT_EQ(prefetch_headers["Accept"],
"application/signed-exchange;v=b1;q=0.9,*/*;q=0.8"); "application/signed-exchange;v=b2;q=0.9,*/*;q=0.8");
else else
EXPECT_EQ(prefetch_headers["Accept"], "*/*"); EXPECT_EQ(prefetch_headers["Accept"], "*/*");
......
third_party/blink/renderer/core/loader/link_loader.cc
View file @ 03168d86
...@@ -576,9 +576,13 @@ static Resource* PrefetchIfNeeded(const LinkLoadParameters& params, ...@@ -576,9 +576,13 @@ static Resource* PrefetchIfNeeded(const LinkLoadParameters& params,
resource_request.SetReferrerPolicy(params.referrer_policy); resource_request.SetReferrerPolicy(params.referrer_policy);
resource_request.SetFetchImportanceMode( resource_request.SetFetchImportanceMode(
GetFetchImportanceAttributeValue(params.importance)); GetFetchImportanceAttributeValue(params.importance));
// If Signed Exchange is enabled, prefer the application/signed-exchange
// content type
// (https://wicg.github.io/webpackage/draft-yasskin-http-origin-signed-responses.html#internet-media-type-applicationsigned-exchange).
if (RuntimeEnabledFeatures::SignedHTTPExchangeEnabled()) { if (RuntimeEnabledFeatures::SignedHTTPExchangeEnabled()) {
DEFINE_STATIC_LOCAL(const AtomicString, accept_prefetch, DEFINE_STATIC_LOCAL(const AtomicString, accept_prefetch,
("application/signed-exchange;v=b1;q=0.9,*/*;q=0.8")); ("application/signed-exchange;v=b2;q=0.9,*/*;q=0.8"));
resource_request.SetHTTPAccept(accept_prefetch); resource_request.SetHTTPAccept(accept_prefetch);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment