Index: Source/core/fetch/ResourceLoader.cpp |
diff --git a/Source/core/fetch/ResourceLoader.cpp b/Source/core/fetch/ResourceLoader.cpp |
index a28665cd4e7976527f0626ef8aba128426f74ac9..be3969ee8743334b159c6d6684be98c343c3ba5b 100644 |
--- a/Source/core/fetch/ResourceLoader.cpp |
+++ b/Source/core/fetch/ResourceLoader.cpp |
@@ -122,11 +122,6 @@ void ResourceLoader::start() |
ASSERT(!m_request.isNull()); |
ASSERT(m_deferredRequest.isNull()); |
- if (responseNeedsAccessControlCheck() && m_fetcher->isControlledByServiceWorker()) { |
- m_fallbackRequestForServiceWorker = adoptPtr(new ResourceRequest(m_request)); |
- m_fallbackRequestForServiceWorker->setSkipServiceWorker(true); |
- } |
- |
m_fetcher->willStartLoadingResource(m_resource, m_request); |
if (m_options.synchronousPolicy == RequestSynchronously) { |
@@ -336,13 +331,13 @@ void ResourceLoader::didReceiveResponse(WebURLLoader*, const WebURLResponse& res |
if (responseNeedsAccessControlCheck()) { |
if (response.wasFetchedViaServiceWorker()) { |
if (response.wasFallbackRequiredByServiceWorker()) { |
- ASSERT(m_fallbackRequestForServiceWorker); |
m_loader->cancel(); |
m_loader.clear(); |
m_connectionState = ConnectionStateStarted; |
- m_request = *m_fallbackRequestForServiceWorker; |
m_loader = adoptPtr(Platform::current()->createURLLoader()); |
ASSERT(m_loader); |
+ ASSERT(!m_request.skipServiceWorker()); |
+ m_request.setSkipServiceWorker(true); |
WrappedResourceRequest wrappedRequest(m_request); |
m_loader->loadAsynchronously(wrappedRequest, this); |
return; |