Move subresource archive loading out of ResourceLoader

Source/core/loader/cache/CachedResourceLoader.cpp

Index: Source/core/loader/cache/CachedResourceLoader.cpp
diff --git a/Source/core/loader/cache/CachedResourceLoader.cpp b/Source/core/loader/cache/CachedResourceLoader.cpp
index 841708aac540e126a08e4f74de335ce3a7639c52..13dc94ff67ae848620d08016a0c32dc9bb5d359a 100644
--- a/Source/core/loader/cache/CachedResourceLoader.cpp
+++ b/Source/core/loader/cache/CachedResourceLoader.cpp
@@ -41,6 +41,7 @@
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/loader/PingLoader.h"
+#include "core/loader/appcache/ApplicationCacheHost.h"
 #include "core/loader/cache/CachedCSSStyleSheet.h"
 #include "core/loader/cache/CachedDocument.h"
 #include "core/loader/cache/CachedFont.h"
@@ -399,7 +400,10 @@ CachedResourceHandle<CachedResource> CachedResourceLoader::requestResource(Cache
         if (request.options().securityCheck == DoSecurityCheck && (frameLoader->state() == FrameStateProvisional || !frameLoader->activeDocumentLoader() || frameLoader->activeDocumentLoader()->isStopping()))
             return 0;
 
-        resource->load(this, request.options());
+        if (!m_documentLoader->scheduleArchiveLoad(resource.get(), request.resourceRequest())) {
+            m_documentLoader->applicationCacheHost()->willStartLoadingResource(request.mutableResourceRequest());
+            resource->load(this, request.options());
+        }
 
         // We don't support immediate loads, but we do support immediate failure.
         if (resource->errorOccurred()) {