Index: content/renderer/fetchers/resource_fetcher_impl.cc |
diff --git a/content/renderer/fetchers/resource_fetcher_impl.cc b/content/renderer/fetchers/resource_fetcher_impl.cc |
index c175abcd79aa00fbdeef1dce707ebf78e70a5d75..3c090a37e414de20326e09de755ce81fb3536549 100644 |
--- a/content/renderer/fetchers/resource_fetcher_impl.cc |
+++ b/content/renderer/fetchers/resource_fetcher_impl.cc |
@@ -24,6 +24,7 @@ using blink::WebHTTPBody; |
using blink::WebSecurityPolicy; |
using blink::WebURLError; |
tyoshino (SeeGerritForStatus)
2015/01/14 04:09:41
[optional] remove this unused using using this opp
mlamouri (slow - plz ping)
2015/01/14 14:31:17
Done.
|
using blink::WebURLLoader; |
+using blink::WebURLLoaderOptions; |
tyoshino (SeeGerritForStatus)
2015/01/14 04:09:41
just one occurrence. maybe it's just fine to add b
mlamouri (slow - plz ping)
2015/01/14 14:31:17
I removed all the |using| while I was at it. Most
|
using blink::WebURLRequest; |
using blink::WebURLResponse; |
@@ -77,6 +78,20 @@ void ResourceFetcherImpl::SetHeader(const std::string& header, |
} |
} |
+void ResourceFetcherImpl::SetSkipServiceWorker(bool skip_service_worker) { |
+ DCHECK(!request_.isNull()); |
+ DCHECK(!loader_); |
+ |
+ request_.setSkipServiceWorker(skip_service_worker); |
+} |
+ |
+void ResourceFetcherImpl::SetLoaderOptions(const WebURLLoaderOptions& options) { |
+ DCHECK(!request_.isNull()); |
+ DCHECK(!loader_); |
+ |
+ options_ = options; |
+} |
+ |
void ResourceFetcherImpl::Start(WebFrame* frame, |
WebURLRequest::RequestContext request_context, |
WebURLRequest::FrameType frame_type, |
@@ -101,7 +116,7 @@ void ResourceFetcherImpl::Start(WebFrame* frame, |
loader_.reset(blink::Platform::current()->createURLLoader()); |
break; |
case FRAME_ASSOCIATED_LOADER: |
- loader_.reset(frame->createAssociatedURLLoader()); |
+ loader_.reset(frame->createAssociatedURLLoader(options_)); |
break; |
} |
loader_->loadAsynchronously(request_, this); |