Move subresource archive loading out of ResourceLoader

Source/core/loader/ResourceLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
  *           (C) 2007 Graham Dennis (graham.dennis@gmail.com)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
@@ skipping 17 matching lines @@
  */
 
 #include "config.h"
 #include "core/loader/ResourceLoader.h"
 
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/loader/UniqueIdentifier.h"
-#include "core/loader/appcache/ApplicationCacheHost.h"
 #include "core/loader/cache/CachedResourceLoader.h"
 #include "core/page/Frame.h"
 #include "core/page/Page.h"
 #include "core/platform/Logging.h"
 #include "core/platform/network/ResourceError.h"
 #include "core/platform/network/ResourceHandle.h"
-#include "weborigin/SecurityOrigin.h"
 
 namespace WebCore {
 
 ResourceLoader::RequestCountTracker::RequestCountTracker(CachedResourceLoader* cachedResourceLoader, CachedResource* resource)
     : m_cachedResourceLoader(cachedResourceLoader)
     , m_resource(resource)
 {
     m_cachedResourceLoader->incrementRequestCount(m_resource);
 }
 
@@ skipping 66 matching lines @@
     }
 
     m_deferredRequest = ResourceRequest();
 }
 
 bool ResourceLoader::init(const ResourceRequest& r)
 {
     ASSERT(!m_handle);
     ASSERT(m_request.isNull());
     ASSERT(m_deferredRequest.isNull());
-    ASSERT(!m_documentLoader->isSubstituteLoadPending(this));
     
     ResourceRequest clientRequest(r);
 
     m_identifier = createUniqueIdentifier();
     willSendRequest(0, clientRequest, ResourceResponse());
     if (clientRequest.isNull()) {
         cancel();
         return false;
     }
     ASSERT(m_state != Terminated);
 
     m_originalRequest = m_request = clientRequest;
     m_state = Initialized;
     m_documentLoader->addResourceLoader(this);
     return true;
 }
 
 void ResourceLoader::start()
 {
     ASSERT(!m_handle);
     ASSERT(!m_request.isNull());
     ASSERT(m_deferredRequest.isNull());
 
-    if (m_documentLoader->scheduleArchiveLoad(this, m_request))
-        return;
-
-    m_documentLoader->applicationCacheHost()->willStartLoadingResource(m_request);

[Nate Chapin, 2013/05/22 23:28:46]

This is the last reference to ApplicationCacheHost in ResourceLoader, and it's
trivial to move, so I did that while I was here.

-
     if (m_defersLoading) {
         m_deferredRequest = m_request;
         return;
     }
 
     if (m_state != Terminated)
         m_handle = ResourceHandle::create(m_frame->loader()->networkingContext(), m_request, this, m_defersLoading, m_options.sniffContent == SniffContent, m_options.allowCredentials);
 }
 
 void ResourceLoader::setDefersLoading(bool defers)
@@ skipping 70 matching lines @@
     // This function calls out to clients at several points that might do
     // something that causes the last reference to this object to go away.
     RefPtr<ResourceLoader> protector(this);
 
     LOG(ResourceLoading, "Cancelled load of '%s'.\n", m_resource->url().string().latin1().data());
     m_state = Finishing;
     m_resource->setResourceError(nonNullError);
     if (m_resource->resourceToRevalidate())
         m_resource->revalidationFailed();
 
-    m_documentLoader->cancelPendingSubstituteLoad(this);
     if (m_handle) {
         m_handle->cancel();
         m_handle = 0;
     }
 
     if (m_options.sendLoadCallbacks == SendCallbacks && m_identifier && !m_notifiedLoadComplete)
         frameLoader()->notifier()->didFailToLoad(this, nonNullError);
 
     m_resource->error(CachedResource::LoadError);
     if (m_state != Terminated)
@@ skipping 197 matching lines @@
     info.addMember(m_request, "request");
     info.addMember(m_originalRequest, "originalRequest");
     info.addMember(m_deferredRequest, "deferredRequest");
     info.addMember(m_options, "options");
     info.addMember(m_resource, "resource");
     info.addMember(m_documentLoader, "documentLoader");
     info.addMember(m_requestCountTracker, "requestCountTracker");
 }
 
 }