diff options
Diffstat (limited to 'Source/WebCore/platform/MIMETypeRegistry.cpp')
| -rw-r--r-- | Source/WebCore/platform/MIMETypeRegistry.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/Source/WebCore/platform/MIMETypeRegistry.cpp b/Source/WebCore/platform/MIMETypeRegistry.cpp index 0f4cc0e..8017c90 100644 --- a/Source/WebCore/platform/MIMETypeRegistry.cpp +++ b/Source/WebCore/platform/MIMETypeRegistry.cpp @@ -27,9 +27,12 @@ #include "config.h" #include "MIMETypeRegistry.h" +<<<<<<< HEAD #if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size #include "ArchiveFactory.h" #endif +======= +>>>>>>> webkit.org at r78450 #include "MediaPlayer.h" #include <wtf/HashMap.h> #include <wtf/HashSet.h> @@ -46,6 +49,10 @@ #include <qimagewriter.h> #endif +#if ENABLE(WEB_ARCHIVE) +#include "ArchiveFactory.h" +#endif + namespace WebCore { static HashSet<String>* supportedImageResourceMIMETypes; @@ -249,7 +256,11 @@ static void initializeSupportedNonImageMimeTypes() for (size_t i = 0; i < WTF_ARRAY_LENGTH(types); ++i) supportedNonImageMIMETypes->add(types[i]); +<<<<<<< HEAD #if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size +======= +#if ENABLE(WEB_ARCHIVE) +>>>>>>> webkit.org at r78450 ArchiveFactory::registerKnownArchiveMIMETypes(); #endif } @@ -369,6 +380,13 @@ static MediaMIMETypeMap& mediaMIMETypeMap() return mediaMIMETypeForExtensionMap; } +#if ENABLE(FILE_SYSTEM) && ENABLE(WORKERS) +String MIMETypeRegistry::getMIMETypeForExtension(const String& extension) +{ + return getMIMETypeForExtensionThreadSafe(extension); +} +#endif + String MIMETypeRegistry::getMediaMIMETypeForExtension(const String& ext) { // Look in the system-specific registry first. |