diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/loader/DocumentLoader.h | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/loader/DocumentLoader.h')
-rw-r--r-- | Source/WebCore/loader/DocumentLoader.h | 40 |
1 files changed, 34 insertions, 6 deletions
diff --git a/Source/WebCore/loader/DocumentLoader.h b/Source/WebCore/loader/DocumentLoader.h index 241102d..38127c1 100644 --- a/Source/WebCore/loader/DocumentLoader.h +++ b/Source/WebCore/loader/DocumentLoader.h @@ -30,6 +30,7 @@ #define DocumentLoader_h #include "DocumentLoadTiming.h" +#include "DocumentWriter.h" #include "NavigationAction.h" #include "ResourceError.h" #include "ResourceRequest.h" @@ -43,8 +44,13 @@ namespace WebCore { class ApplicationCacheHost; +<<<<<<< HEAD #if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size +======= +#if ENABLE(WEB_ARCHIVE) +>>>>>>> webkit.org at r78450 class Archive; +#endif class ArchiveResource; class ArchiveResourceCollection; #endif @@ -77,6 +83,8 @@ namespace WebCore { FrameLoader* frameLoader() const; MainResourceLoader* mainResourceLoader() const { return m_mainResourceLoader.get(); } PassRefPtr<SharedBuffer> mainResourceData() const; + + DocumentWriter* writer() const { return &m_writer; } const ResourceRequest& originalRequest() const; const ResourceRequest& originalRequestCopy() const; @@ -126,26 +134,39 @@ namespace WebCore { void unschedule(SchedulePair*); #endif +<<<<<<< HEAD #if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size +======= +#if ENABLE(WEB_ARCHIVE) +>>>>>>> webkit.org at r78450 void addAllArchiveResources(Archive*); void addArchiveResource(PassRefPtr<ArchiveResource>); - // Return an ArchiveResource for the URL, either creating from live data or - // pulling from the ArchiveResourceCollection - PassRefPtr<ArchiveResource> subresource(const KURL&) const; - // Return the ArchiveResource for the URL only when loading an Archive - ArchiveResource* archiveResourceForURL(const KURL&) const; - PassRefPtr<Archive> popArchiveForSubframe(const String& frameName); void clearArchiveResources(); void setParsedArchiveData(PassRefPtr<SharedBuffer>); SharedBuffer* parsedArchiveData() const; + bool scheduleArchiveLoad(ResourceLoader*, const ResourceRequest&, const KURL&); +#endif // ENABLE(WEB_ARCHIVE) + + // Return the ArchiveResource for the URL only when loading an Archive + ArchiveResource* archiveResourceForURL(const KURL&) const; + PassRefPtr<ArchiveResource> mainResource() const; + + // Return an ArchiveResource for the URL, either creating from live data or + // pulling from the ArchiveResourceCollection + PassRefPtr<ArchiveResource> subresource(const KURL&) const; void getSubresources(Vector<PassRefPtr<ArchiveResource> >&) const; +<<<<<<< HEAD bool scheduleArchiveLoad(ResourceLoader*, const ResourceRequest&, const KURL&); #endif +======= + + +>>>>>>> webkit.org at r78450 #ifndef NDEBUG bool isSubstituteLoadPending(ResourceLoader*) const; #endif @@ -253,6 +274,8 @@ namespace WebCore { ResourceLoaderSet m_plugInStreamLoaders; RefPtr<SharedBuffer> m_mainResourceData; + + mutable DocumentWriter m_writer; // A reference to actual request used to create the data source. // This should only be used by the resourceLoadDelegate's @@ -305,9 +328,14 @@ namespace WebCore { typedef HashMap<RefPtr<ResourceLoader>, RefPtr<SubstituteResource> > SubstituteResourceMap; SubstituteResourceMap m_pendingSubstituteResources; Timer<DocumentLoader> m_substituteResourceDeliveryTimer; +<<<<<<< HEAD #if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size +======= + +>>>>>>> webkit.org at r78450 OwnPtr<ArchiveResourceCollection> m_archiveResourceCollection; +#if ENABLE(WEB_ARCHIVE) RefPtr<SharedBuffer> m_parsedArchiveData; #endif |