diff options
| author | Steve Block <steveblock@google.com> | 2011-05-19 18:45:53 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-19 19:02:30 +0100 |
| commit | 8d8e15107907178b19f50a476bb610afc97a3c07 (patch) | |
| tree | d1f3779adead52759cb05b14f25df506a3350360 /Source/WebCore | |
| parent | 51d4f995ba2c20675e3f849bc02334d33b5b8eab (diff) | |
| download | external_webkit-8d8e15107907178b19f50a476bb610afc97a3c07.zip external_webkit-8d8e15107907178b19f50a476bb610afc97a3c07.tar.gz external_webkit-8d8e15107907178b19f50a476bb610afc97a3c07.tar.bz2 | |
Remove some superfluous ARCHIVE enable guards
A new WEB_ARCHIVE enable guard will be added upstream in
http://trac.webkit.org/changeset/78439, replacing our downstream
ARCHIVE guard.
This patch removes a couple of instances of the downstream guard that
are not required and hence will not be replaced by the upstream guard.
Change-Id: Ibc8ca754617e8b34fd8563f6f3b9fa671e871f23
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/loader/DocumentLoader.cpp | 4 | ||||
| -rw-r--r-- | Source/WebCore/loader/FrameLoader.h | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp index 4e7c656..6e91107 100644 --- a/Source/WebCore/loader/DocumentLoader.cpp +++ b/Source/WebCore/loader/DocumentLoader.cpp @@ -30,12 +30,8 @@ #include "DocumentLoader.h" #include "ApplicationCacheHost.h" -#if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size #include "ArchiveFactory.h" #include "ArchiveResourceCollection.h" -#else -#include "SubstituteResource.h" -#endif #include "CachedPage.h" #include "CachedResourceLoader.h" #include "DOMWindow.h" diff --git a/Source/WebCore/loader/FrameLoader.h b/Source/WebCore/loader/FrameLoader.h index 0cc1fa7..12afbdd 100644 --- a/Source/WebCore/loader/FrameLoader.h +++ b/Source/WebCore/loader/FrameLoader.h @@ -46,9 +46,7 @@ namespace WebCore { -#if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size class Archive; -#endif class AuthenticationChallenge; class CachedFrameBase; class CachedPage; |