Index: Source/core/loader/cache/CachedResourceLoader.cpp |
diff --git a/Source/core/loader/cache/CachedResourceLoader.cpp b/Source/core/loader/cache/CachedResourceLoader.cpp |
index 2dd32893ad18c270b28f7f4a5b64dde8331de027..cba13f9a96ec62d2df913291b35237696a6c407c 100644 |
--- a/Source/core/loader/cache/CachedResourceLoader.cpp |
+++ b/Source/core/loader/cache/CachedResourceLoader.cpp |
@@ -31,6 +31,7 @@ |
#include "core/dom/Document.h" |
#include "core/html/HTMLElement.h" |
#include "core/html/HTMLFrameOwnerElement.h" |
+#include "core/html/HTMLImport.h" |
#include "core/inspector/InspectorInstrumentation.h" |
#include "core/loader/DocumentLoader.h" |
#include "core/loader/FrameLoader.h" |
@@ -187,7 +188,14 @@ CachedResource* CachedResourceLoader::cachedResource(const KURL& resourceURL) co |
Frame* CachedResourceLoader::frame() const |
{ |
- return m_documentLoader ? m_documentLoader->frame() : 0; |
+ if (m_documentLoader) |
+ return m_documentLoader->frame(); |
+ if (m_document) { |
+ if (HTMLImport* import = m_document->import()) |
+ return import->frame(); |
+ } |
+ |
+ return 0; |
} |
CachedResourceHandle<CachedImage> CachedResourceLoader::requestImage(CachedResourceRequest& request) |
@@ -506,7 +514,7 @@ CachedResourceHandle<CachedResource> CachedResourceLoader::requestResource(Cache |
if (request.options().securityCheck == DoSecurityCheck && (frameLoader->state() == FrameStateProvisional || !frameLoader->activeDocumentLoader() || frameLoader->activeDocumentLoader()->isStopping())) |
return 0; |
- if (!m_documentLoader->scheduleArchiveLoad(resource.get(), request.resourceRequest())) |
+ if (!m_documentLoader || !m_documentLoader->scheduleArchiveLoad(resource.get(), request.resourceRequest())) |
resource->load(this, request.options()); |
// We don't support immediate loads, but we do support immediate failure. |
@@ -605,7 +613,7 @@ ResourceRequestCachePolicy CachedResourceLoader::resourceRequestCachePolicy(cons |
if (request.isConditional()) |
return ReloadIgnoringCacheData; |
- if (m_documentLoader->isLoadingInAPISense()) { |
+ if (m_documentLoader && m_documentLoader->isLoadingInAPISense()) { |
// For POST requests, we mutate the main resource's cache policy to avoid form resubmission. |
// This policy should not be inherited by subresources. |
ResourceRequestCachePolicy mainResourceCachePolicy = m_documentLoader->request().cachePolicy(); |