diff options
| author | Steve Block <steveblock@google.com> | 2009-12-15 10:12:09 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-12-17 17:41:10 +0000 |
| commit | 643ca7872b450ea4efacab6188849e5aac2ba161 (patch) | |
| tree | 6982576c228bcd1a7efe98afed544d840751094c /WebCore/loader/archive | |
| parent | d026980fde6eb3b01c1fe49441174e89cd1be298 (diff) | |
| download | external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.zip external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.gz external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.bz2 | |
Merge webkit.org at r51976 : Initial merge by git.
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
Diffstat (limited to 'WebCore/loader/archive')
| -rw-r--r-- | WebCore/loader/archive/ArchiveFactory.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/WebCore/loader/archive/ArchiveFactory.cpp b/WebCore/loader/archive/ArchiveFactory.cpp index 1322dbb..d09b064 100644 --- a/WebCore/loader/archive/ArchiveFactory.cpp +++ b/WebCore/loader/archive/ArchiveFactory.cpp @@ -29,12 +29,13 @@ #include "config.h" #include "ArchiveFactory.h" -#if PLATFORM(CF) -#include "LegacyWebArchive.h" -#endif #include "MIMETypeRegistry.h" #include "PlatformString.h" +#if PLATFORM(CF) && !PLATFORM(QT) +#include "LegacyWebArchive.h" +#endif + #include <wtf/HashMap.h> #include <wtf/HashSet.h> #include <wtf/StdLibExtras.h> @@ -55,14 +56,14 @@ static ArchiveMIMETypesMap& archiveMIMETypes() { DEFINE_STATIC_LOCAL(ArchiveMIMETypesMap, mimeTypes, ()); static bool initialized = false; - + if (initialized) return mimeTypes; - -#if PLATFORM(CF) + +#if PLATFORM(CF) && !PLATFORM(QT) mimeTypes.set("application/x-webarchive", archiveFactoryCreate<LegacyWebArchive>); #endif - + initialized = true; return mimeTypes; } |