Commit b3adecac authored by hiroshige's avatar hiroshige Committed by Commit bot

Remove mutableResourceRequest() by FetchRequest::setRequestContext()

It is common that FooResource::fetch()-like functions sets
the request context via mutableResourceRequest().
This CL centralizes such mutableResourceRequest() calls into newly
introduced FetchRequest::setRequestContext(), to limit the ways to
modify a ResourceRequest after it is put in a FetchRequest.

BUG=632580

Review-Url: https://codereview.chromium.org/2741753003
Cr-Commit-Position: refs/heads/master@{#456208}
parent fd95cbb9
...@@ -41,8 +41,7 @@ CSSStyleSheetResource* CSSStyleSheetResource::fetch(FetchRequest& request, ...@@ -41,8 +41,7 @@ CSSStyleSheetResource* CSSStyleSheetResource::fetch(FetchRequest& request,
ResourceFetcher* fetcher) { ResourceFetcher* fetcher) {
DCHECK_EQ(request.resourceRequest().frameType(), DCHECK_EQ(request.resourceRequest().frameType(),
WebURLRequest::FrameTypeNone); WebURLRequest::FrameTypeNone);
request.mutableResourceRequest().setRequestContext( request.setRequestContext(WebURLRequest::RequestContextStyle);
WebURLRequest::RequestContextStyle);
CSSStyleSheetResource* resource = toCSSStyleSheetResource( CSSStyleSheetResource* resource = toCSSStyleSheetResource(
fetcher->requestResource(request, CSSStyleSheetResourceFactory())); fetcher->requestResource(request, CSSStyleSheetResourceFactory()));
// TODO(kouhei): Dedupe this logic w/ ScriptResource::fetch // TODO(kouhei): Dedupe this logic w/ ScriptResource::fetch
......
...@@ -34,8 +34,7 @@ DocumentResource* DocumentResource::fetchSVGDocument(FetchRequest& request, ...@@ -34,8 +34,7 @@ DocumentResource* DocumentResource::fetchSVGDocument(FetchRequest& request,
ResourceFetcher* fetcher) { ResourceFetcher* fetcher) {
DCHECK_EQ(request.resourceRequest().frameType(), DCHECK_EQ(request.resourceRequest().frameType(),
WebURLRequest::FrameTypeNone); WebURLRequest::FrameTypeNone);
request.mutableResourceRequest().setRequestContext( request.setRequestContext(WebURLRequest::RequestContextImage);
WebURLRequest::RequestContextImage);
return toDocumentResource( return toDocumentResource(
fetcher->requestResource(request, SVGDocumentResourceFactory())); fetcher->requestResource(request, SVGDocumentResourceFactory()));
} }
......
...@@ -77,8 +77,7 @@ FontResource* FontResource::fetch(FetchRequest& request, ...@@ -77,8 +77,7 @@ FontResource* FontResource::fetch(FetchRequest& request,
ResourceFetcher* fetcher) { ResourceFetcher* fetcher) {
DCHECK_EQ(request.resourceRequest().frameType(), DCHECK_EQ(request.resourceRequest().frameType(),
WebURLRequest::FrameTypeNone); WebURLRequest::FrameTypeNone);
request.mutableResourceRequest().setRequestContext( request.setRequestContext(WebURLRequest::RequestContextFont);
WebURLRequest::RequestContextFont);
return toFontResource( return toFontResource(
fetcher->requestResource(request, FontResourceFactory())); fetcher->requestResource(request, FontResourceFactory()));
} }
......
...@@ -151,8 +151,7 @@ ImageResource* ImageResource::fetch(FetchRequest& request, ...@@ -151,8 +151,7 @@ ImageResource* ImageResource::fetch(FetchRequest& request,
ResourceFetcher* fetcher) { ResourceFetcher* fetcher) {
if (request.resourceRequest().requestContext() == if (request.resourceRequest().requestContext() ==
WebURLRequest::RequestContextUnspecified) { WebURLRequest::RequestContextUnspecified) {
request.mutableResourceRequest().setRequestContext( request.setRequestContext(WebURLRequest::RequestContextImage);
WebURLRequest::RequestContextImage);
} }
if (fetcher->context().pageDismissalEventBeingDispatched()) { if (fetcher->context().pageDismissalEventBeingDispatched()) {
KURL requestURL = request.resourceRequest().url(); KURL requestURL = request.resourceRequest().url();
......
...@@ -41,8 +41,7 @@ ScriptResource* ScriptResource::fetch(FetchRequest& request, ...@@ -41,8 +41,7 @@ ScriptResource* ScriptResource::fetch(FetchRequest& request,
ResourceFetcher* fetcher) { ResourceFetcher* fetcher) {
DCHECK_EQ(request.resourceRequest().frameType(), DCHECK_EQ(request.resourceRequest().frameType(),
WebURLRequest::FrameTypeNone); WebURLRequest::FrameTypeNone);
request.mutableResourceRequest().setRequestContext( request.setRequestContext(WebURLRequest::RequestContextScript);
WebURLRequest::RequestContextScript);
ScriptResource* resource = toScriptResource( ScriptResource* resource = toScriptResource(
fetcher->requestResource(request, ScriptResourceFactory())); fetcher->requestResource(request, ScriptResourceFactory()));
if (resource && !request.integrityMetadata().isEmpty()) if (resource && !request.integrityMetadata().isEmpty())
......
...@@ -81,6 +81,10 @@ class PLATFORM_EXPORT FetchRequest { ...@@ -81,6 +81,10 @@ class PLATFORM_EXPORT FetchRequest {
const ResourceRequest& resourceRequest() const { return m_resourceRequest; } const ResourceRequest& resourceRequest() const { return m_resourceRequest; }
const KURL& url() const { return m_resourceRequest.url(); } const KURL& url() const { return m_resourceRequest.url(); }
void setRequestContext(WebURLRequest::RequestContext context) {
m_resourceRequest.setRequestContext(context);
}
const String& charset() const { return m_charset; } const String& charset() const { return m_charset; }
void setCharset(const String& charset) { m_charset = charset; } void setCharset(const String& charset) { m_charset = charset; }
......
...@@ -46,8 +46,7 @@ RawResource* RawResource::fetchImport(FetchRequest& request, ...@@ -46,8 +46,7 @@ RawResource* RawResource::fetchImport(FetchRequest& request,
ResourceFetcher* fetcher) { ResourceFetcher* fetcher) {
DCHECK_EQ(request.resourceRequest().frameType(), DCHECK_EQ(request.resourceRequest().frameType(),
WebURLRequest::FrameTypeNone); WebURLRequest::FrameTypeNone);
request.mutableResourceRequest().setRequestContext( request.setRequestContext(WebURLRequest::RequestContextImport);
WebURLRequest::RequestContextImport);
return toRawResource(fetcher->requestResource( return toRawResource(fetcher->requestResource(
request, RawResourceFactory(Resource::ImportResource))); request, RawResourceFactory(Resource::ImportResource)));
} }
...@@ -101,8 +100,7 @@ RawResource* RawResource::fetchTextTrack(FetchRequest& request, ...@@ -101,8 +100,7 @@ RawResource* RawResource::fetchTextTrack(FetchRequest& request,
ResourceFetcher* fetcher) { ResourceFetcher* fetcher) {
DCHECK_EQ(request.resourceRequest().frameType(), DCHECK_EQ(request.resourceRequest().frameType(),
WebURLRequest::FrameTypeNone); WebURLRequest::FrameTypeNone);
request.mutableResourceRequest().setRequestContext( request.setRequestContext(WebURLRequest::RequestContextTrack);
WebURLRequest::RequestContextTrack);
return toRawResource(fetcher->requestResource( return toRawResource(fetcher->requestResource(
request, RawResourceFactory(Resource::TextTrack))); request, RawResourceFactory(Resource::TextTrack)));
} }
......
...@@ -28,8 +28,7 @@ class MockResourceFactory final : public ResourceFactory { ...@@ -28,8 +28,7 @@ class MockResourceFactory final : public ResourceFactory {
// static // static
MockResource* MockResource::fetch(FetchRequest& request, MockResource* MockResource::fetch(FetchRequest& request,
ResourceFetcher* fetcher) { ResourceFetcher* fetcher) {
request.mutableResourceRequest().setRequestContext( request.setRequestContext(WebURLRequest::RequestContextSubresource);
WebURLRequest::RequestContextSubresource);
Resource* resource = fetcher->requestResource(request, MockResourceFactory()); Resource* resource = fetcher->requestResource(request, MockResourceFactory());
return static_cast<MockResource*>(resource); return static_cast<MockResource*>(resource);
} }
......
...@@ -8246,8 +8246,7 @@ TEST_P(ParameterizedWebFrameTest, NotifyManifestChange) { ...@@ -8246,8 +8246,7 @@ TEST_P(ParameterizedWebFrameTest, NotifyManifestChange) {
static Resource* fetchManifest(Document* document, const KURL& url) { static Resource* fetchManifest(Document* document, const KURL& url) {
FetchRequest fetchRequest = FetchRequest fetchRequest =
FetchRequest(ResourceRequest(url), FetchInitiatorInfo()); FetchRequest(ResourceRequest(url), FetchInitiatorInfo());
fetchRequest.mutableResourceRequest().setRequestContext( fetchRequest.setRequestContext(WebURLRequest::RequestContextManifest);
WebURLRequest::RequestContextManifest);
return RawResource::fetchSynchronously(fetchRequest, document->fetcher()); return RawResource::fetchSynchronously(fetchRequest, document->fetcher());
} }
......
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