| Index: Source/core/fetch/ResourceFetcher.cpp
|
| diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp
|
| index b2745fa7a34769601c7dd726a84931e0d817c55e..9f3a94b0cbb2ade3786e1ea637136015d5f96cbf 100644
|
| --- a/Source/core/fetch/ResourceFetcher.cpp
|
| +++ b/Source/core/fetch/ResourceFetcher.cpp
|
| @@ -791,7 +791,7 @@ ResourcePtr<Resource> ResourceFetcher::requestResource(Resource::Type type, Fetc
|
| // FIXME: isControlledByServiceWorker() always returns false on main
|
| // resource request, but main resource is always removed from the cache
|
| // as the above comment (http://crbug.com/388375).
|
| - if (frame() && m_documentLoader && frame()->loader().client()->isControlledByServiceWorker(*m_documentLoader)) {
|
| + if (isControlledByServiceWorker()) {
|
| ASSERT(policy == Load || policy == Reload);
|
| memoryCache()->remove(resource.get());
|
| }
|
| @@ -955,7 +955,7 @@ ResourceFetcher::RevalidationPolicy ResourceFetcher::determineRevalidationPolicy
|
|
|
| // FIXME: Currently caching for a resource to be handled by Service Worker
|
| // is disabled (http://crbug.com/388375).
|
| - if (frame() && m_documentLoader && frame()->loader().client()->isControlledByServiceWorker(*m_documentLoader))
|
| + if (isControlledByServiceWorker())
|
| return Reload;
|
|
|
| // We already have a preload going for this URL.
|
|
|