Move the remainder of Archive loading from FrameLoader to DocumentLoader.

Source/core/loader/DocumentLoader.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * 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 103 matching lines @@
         const ResourceResponse& response() const { return m_response; }
         const ResourceError& mainDocumentError() const { return m_mainDocumentError; }
         bool isClientRedirect() const { return m_isClientRedirect; }
         void setIsClientRedirect(bool isClientRedirect) { m_isClientRedirect = isClientRedirect; }
         void handledOnloadEvents();
         bool wasOnloadHandled() { return m_wasOnloadHandled; }
         bool isLoadingInAPISense() const;
         void setTitle(const StringWithDirection&);
         const String& overrideEncoding() const { return m_overrideEncoding; }
 
-        void setArchive(PassRefPtr<MHTMLArchive>);
-        void addAllArchiveResources(MHTMLArchive*);
-        PassRefPtr<MHTMLArchive> popArchiveForSubframe(const String& frameName, const KURL&);
-
         bool scheduleArchiveLoad(ResourceLoader*, const ResourceRequest&);
 
-        // Return the ArchiveResource for the URL only when loading an Archive
-        ArchiveResource* archiveResourceForURL(const KURL&) const;
-
 #ifndef NDEBUG
         bool isSubstituteLoadPending(ResourceLoader*) const;
 #endif
         void cancelPendingSubstituteLoad(ResourceLoader*);
 
         bool shouldContinueForNavigationPolicy(const ResourceRequest&);
         const NavigationAction& triggeringAction() const { return m_triggeringAction; }
         void setTriggeringAction(const NavigationAction& action) { m_triggeringAction = action; }
 
         void setOverrideEncoding(const String& encoding) { m_overrideEncoding = encoding; }
@@ skipping 60 matching lines @@
         void setMainDocumentError(const ResourceError&);
         void commitLoad(const char*, int);
         void clearMainResourceLoader();
 
         void setupForReplace();
         void maybeFinishLoadingMultipartContent();
         
         bool maybeCreateArchive();
         void clearArchiveResources();
 
+        void prepareSubframeArchiveLoadIfNeeded();
+        void addAllArchiveResources(MHTMLArchive*);
+        ArchiveResource* archiveResourceForURL(const KURL&) const;
+
         void willSendRequest(ResourceRequest&, const ResourceResponse&);
         void finishedLoading(double finishTime);
         void mainReceivedError(const ResourceError&);
         virtual void redirectReceived(CachedResource*, ResourceRequest&, const ResourceResponse&) OVERRIDE;
         virtual void responseReceived(CachedResource*, const ResourceResponse&) OVERRIDE;
         virtual void dataReceived(CachedResource*, const char* data, int length) OVERRIDE;
         virtual void notifyFinished(CachedResource*) OVERRIDE;
 
         bool maybeLoadEmpty();
 
@@ skipping 91 matching lines @@
 
     inline void DocumentLoader::takeMemoryCacheLoadsForClientNotification(Vector<String>& loadsSet)
     {
         loadsSet.swap(m_resourcesLoadedFromMemoryCacheForClientNotification);
         m_resourcesLoadedFromMemoryCacheForClientNotification.clear();
     }
 
 }
 
 #endif // DocumentLoader_h