diff options
Diffstat (limited to 'WebCore/loader/DocumentLoader.h')
-rw-r--r-- | WebCore/loader/DocumentLoader.h | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/WebCore/loader/DocumentLoader.h b/WebCore/loader/DocumentLoader.h index 4493e22..e4cf2c7 100644 --- a/WebCore/loader/DocumentLoader.h +++ b/WebCore/loader/DocumentLoader.h @@ -38,10 +38,14 @@ namespace WebCore { +#ifdef MANUAL_MERGE_REQUIRED class ApplicationCache; class ApplicationCacheGroup; class ApplicationCacheResource; #if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size +#else // MANUAL_MERGE_REQUIRED + class ApplicationCacheHost; +#endif // MANUAL_MERGE_REQUIRED class Archive; class ArchiveResource; class ArchiveResourceCollection; @@ -211,18 +215,7 @@ namespace WebCore { void takeMemoryCacheLoadsForClientNotification(Vector<String>& loads); #if ENABLE(OFFLINE_WEB_APPLICATIONS) - bool scheduleApplicationCacheLoad(ResourceLoader*, const ResourceRequest&, const KURL& originalURL); - bool scheduleLoadFallbackResourceFromApplicationCache(ResourceLoader*, const ResourceRequest&, ApplicationCache* = 0); - bool shouldLoadResourceFromApplicationCache(const ResourceRequest&, ApplicationCacheResource*&); - bool getApplicationCacheFallbackResource(const ResourceRequest&, ApplicationCacheResource*&, ApplicationCache* = 0); - - void setCandidateApplicationCacheGroup(ApplicationCacheGroup* group); - ApplicationCacheGroup* candidateApplicationCacheGroup() const { return m_candidateApplicationCacheGroup; } - - void setApplicationCache(PassRefPtr<ApplicationCache> applicationCache); - ApplicationCache* applicationCache() const { return m_applicationCache.get(); } - - ApplicationCache* mainResourceApplicationCache() const; + ApplicationCacheHost* applicationCacheHost() const { return m_applicationCacheHost.get(); } #endif protected: @@ -312,16 +305,9 @@ namespace WebCore { String m_clientRedirectSourceForHistory; bool m_didCreateGlobalHistoryEntry; -#if ENABLE(OFFLINE_WEB_APPLICATIONS) - // The application cache that the document loader is associated with (if any). - RefPtr<ApplicationCache> m_applicationCache; - - // Before an application cache has finished loading, this will be the candidate application - // group that the document loader is associated with. - ApplicationCacheGroup* m_candidateApplicationCacheGroup; - - // Once the main resource has finished loading, this is the application cache it was loaded from (if any). - RefPtr<ApplicationCache> m_mainResourceApplicationCache; +#if ENABLE(OFFLINE_WEB_APPLICATIONS) + friend class ApplicationCacheHost; // for substitute resource delivery + OwnPtr<ApplicationCacheHost> m_applicationCacheHost; #endif }; |