diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 14:44:04 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-25 12:25:49 +0100 |
| commit | d73b16bdebb9d20b17be0a30e626dc9e66b6d868 (patch) | |
| tree | 01132a34552f1414cc645c5f8e87bb1ed8fe5714 /Source/WebCore/loader/DocumentLoader.cpp | |
| parent | 15f1859ccdb0b25adc4607224a80c99b686fe0bb (diff) | |
| download | external_webkit-d73b16bdebb9d20b17be0a30e626dc9e66b6d868.zip external_webkit-d73b16bdebb9d20b17be0a30e626dc9e66b6d868.tar.gz external_webkit-d73b16bdebb9d20b17be0a30e626dc9e66b6d868.tar.bz2 | |
Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard
This replaces, and therefore conflicts with, Android's existing
ENABLE_ARCHIVE guard. This change resolves the conflicts by taking the
upstream guard in WebCore, updates WebKit to use the new guard, and
enables this guard on Android.
See http://trac.webkit.org/changeset/78439
See also http://trac.webkit.org/changeset/78342 for FrameLoader.cpp
Change-Id: I28ebaf3d69ea4c352ab4cfbf91c33a8ba25f89b5
Diffstat (limited to 'Source/WebCore/loader/DocumentLoader.cpp')
| -rw-r--r-- | Source/WebCore/loader/DocumentLoader.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp index 3ae23fa..e8a7c41 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp @@ -295,11 +295,7 @@ void DocumentLoader::commitLoad(const char* data, int length) FrameLoader* frameLoader = DocumentLoader::frameLoader(); if (!frameLoader) return; -<<<<<<< HEAD -#if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size -======= #if ENABLE(WEB_ARCHIVE) ->>>>>>> webkit.org at r78450 if (ArchiveFactory::isArchiveMimeType(response().mimeType())) return; #endif @@ -359,11 +355,7 @@ void DocumentLoader::setupForReplaceByMIMEType(const String& newMIMEType) stopLoadingSubresources(); stopLoadingPlugIns(); -<<<<<<< HEAD -#if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size -======= #if ENABLE(WEB_ARCHIVE) ->>>>>>> webkit.org at r78450 clearArchiveResources(); #endif } @@ -453,11 +445,7 @@ bool DocumentLoader::isLoadingInAPISense() const return frameLoader()->subframeIsLoading(); } -<<<<<<< HEAD -#if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size -======= #if ENABLE(WEB_ARCHIVE) ->>>>>>> webkit.org at r78450 void DocumentLoader::addAllArchiveResources(Archive* archive) { if (!m_archiveResourceCollection) @@ -564,7 +552,6 @@ void DocumentLoader::getSubresources(Vector<PassRefPtr<ArchiveResource> >& subre return; } -#endif void DocumentLoader::deliverSubstituteResourcesAfterDelay() { @@ -623,11 +610,7 @@ void DocumentLoader::cancelPendingSubstituteLoad(ResourceLoader* loader) m_substituteResourceDeliveryTimer.stop(); } -<<<<<<< HEAD -#if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size -======= #if ENABLE(WEB_ARCHIVE) ->>>>>>> webkit.org at r78450 bool DocumentLoader::scheduleArchiveLoad(ResourceLoader* loader, const ResourceRequest& request, const KURL& originalURL) { ArchiveResource* resource = 0; @@ -648,11 +631,7 @@ bool DocumentLoader::scheduleArchiveLoad(ResourceLoader* loader, const ResourceR return true; } -<<<<<<< HEAD -#endif -======= #endif // ENABLE(WEB_ARCHIVE) ->>>>>>> webkit.org at r78450 void DocumentLoader::addResponse(const ResourceResponse& r) { |