Index: third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp |
diff --git a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp |
index 59f8255ac072ee8555d3f1b8964d127dcd1717d6..8a426c03f2d5c0286c9a46202907cf964cb8a89e 100644 |
--- a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp |
+++ b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp |
@@ -208,9 +208,9 @@ static void populateTimingInfo(ResourceTimingInfo* info, Resource* resource) { |
info->setFinalResponse(resource->response()); |
} |
-static WebURLRequest::RequestContext requestContextFromType( |
- bool isMainFrame, |
- Resource::Type type) { |
+WebURLRequest::RequestContext ResourceFetcher::determineRequestContext( |
+ Resource::Type type, |
+ bool isMainFrame) { |
switch (type) { |
case Resource::MainResource: |
if (!isMainFrame) |
@@ -637,17 +637,9 @@ void ResourceFetcher::resourceTimingReportTimerFired(TimerBase* timer) { |
context().addResourceTiming(*timingInfo); |
} |
-void ResourceFetcher::determineRequestContext(ResourceRequest& request, |
- Resource::Type type, |
- bool isMainFrame) { |
- WebURLRequest::RequestContext requestContext = |
- requestContextFromType(isMainFrame, type); |
- request.setRequestContext(requestContext); |
-} |
- |
-void ResourceFetcher::determineRequestContext(ResourceRequest& request, |
- Resource::Type type) { |
- determineRequestContext(request, type, context().isMainFrame()); |
+WebURLRequest::RequestContext ResourceFetcher::determineRequestContext( |
+ Resource::Type type) const { |
+ return determineRequestContext(type, context().isMainFrame()); |
} |
void ResourceFetcher::initializeResourceRequest( |
@@ -659,7 +651,7 @@ void ResourceFetcher::initializeResourceRequest( |
context().resourceRequestCachePolicy(request, type, defer)); |
} |
if (request.requestContext() == WebURLRequest::RequestContextUnspecified) |
- determineRequestContext(request, type); |
+ request.setRequestContext(determineRequestContext(type)); |
if (type == Resource::LinkPrefetch) |
request.setHTTPHeaderField(HTTPNames::Purpose, "prefetch"); |