Index: Source/WebCore/loader/archive/ArchiveFactory.cpp |
diff --git a/Source/WebCore/loader/archive/ArchiveFactory.cpp b/Source/WebCore/loader/archive/ArchiveFactory.cpp |
index e95e0f9fb5930cd325254ac95fd2991cb5366f55..ab031869d98f602816a825f76fdf1c3f0c4030af 100644 |
--- a/Source/WebCore/loader/archive/ArchiveFactory.cpp |
+++ b/Source/WebCore/loader/archive/ArchiveFactory.cpp |
@@ -29,9 +29,15 @@ |
#include "config.h" |
#include "ArchiveFactory.h" |
-#include "MHTMLArchive.h" |
#include "MIMETypeRegistry.h" |
+#if USE(CF) && ENABLE(WEB_ARCHIVE) |
eae
2013/04/05 22:28:53
Where did this come from?
Nate Chapin
2013/04/05 22:31:03
I removed these ifdefs a few hours ago, must be a
|
+#include "LegacyWebArchive.h" |
+#endif |
+#if ENABLE(MHTML) |
+#include "MHTMLArchive.h" |
+#endif |
+ |
#include <wtf/HashMap.h> |
#include <wtf/HashSet.h> |
#include <wtf/StdLibExtras.h> |
@@ -57,7 +63,12 @@ static ArchiveMIMETypesMap& archiveMIMETypes() |
if (initialized) |
return mimeTypes; |
+#if ENABLE(WEB_ARCHIVE) && USE(CF) |
+ mimeTypes.set("application/x-webarchive", archiveFactoryCreate<LegacyWebArchive>); |
+#endif |
+#if ENABLE(MHTML) |
mimeTypes.set("multipart/related", archiveFactoryCreate<MHTMLArchive>); |
+#endif |
initialized = true; |
return mimeTypes; |