[ServiceWorker] Fix ResourceFetcher::isControlledByServiceWorker to support HTMLImports.

Source/core/fetch/ResourceFetcher.cpp

Index: Source/core/fetch/ResourceFetcher.cpp
diff --git a/Source/core/fetch/ResourceFetcher.cpp b/Source/core/fetch/ResourceFetcher.cpp
index e6d13535757fe6171ad088c3e2218dda1bcc5d07..7ae25471af572af686579a48f391ae5eddf056f1 100644
--- a/Source/core/fetch/ResourceFetcher.cpp
+++ b/Source/core/fetch/ResourceFetcher.cpp
@@ -619,9 +619,13 @@ bool ResourceFetcher::isControlledByServiceWorker() const
     LocalFrame* localFrame = frame();
     if (!localFrame)
         return false;
-    if (!m_documentLoader)
-        return false;
-    return localFrame->loader().client()->isControlledByServiceWorker(*m_documentLoader);
+    if (m_documentLoader)
+        return localFrame->loader().client()->isControlledByServiceWorker(*m_documentLoader);
+    // m_documentLoader is null while loading resources from the imported HTML.
+    // In such cases whether the request is controlled by ServiceWorker or not
+    // is determined by the document loader of the frame.
+    ASSERT(localFrame->loader().documentLoader());

[Mike West, 2014/10/28 08:42:47]

Nit: I'd suggest moving this (and the comment) up to the top as a precondition
for the method, e.g. `ASSERT(m_documentLoader ||
localFrame->loader().documentLoader())`.

[horo, 2014/10/28 14:36:36]

Done.

+    return localFrame->loader().client()->isControlledByServiceWorker(*localFrame->loader().documentLoader());
 }
 
 bool ResourceFetcher::shouldLoadNewResource(Resource::Type type) const