| Index: Source/WebCore/platform/MIMETypeRegistry.cpp
|
| diff --git a/Source/WebCore/platform/MIMETypeRegistry.cpp b/Source/WebCore/platform/MIMETypeRegistry.cpp
|
| index ec17de19d52560df5b27ba9cc93468d16d555192..72ced21c955ad6a935f93b12546f59b4655d127a 100644
|
| --- a/Source/WebCore/platform/MIMETypeRegistry.cpp
|
| +++ b/Source/WebCore/platform/MIMETypeRegistry.cpp
|
| @@ -308,9 +308,6 @@ static void initializeSupportedImageMIMETypesForEncoding()
|
| supportedImageMIMETypesForEncoding->add("image/tiff");
|
| supportedImageMIMETypesForEncoding->add("image/bmp");
|
| supportedImageMIMETypesForEncoding->add("image/ico");
|
| -#elif PLATFORM(BLACKBERRY)
|
| - supportedImageMIMETypesForEncoding->add("image/png");
|
| - supportedImageMIMETypesForEncoding->add("image/jpeg");
|
| #endif
|
| }
|
|
|
| @@ -645,82 +642,9 @@ const String& defaultMIMEType()
|
| return defaultMIMEType;
|
| }
|
|
|
| -#if !PLATFORM(QT) && !PLATFORM(BLACKBERRY)
|
| String MIMETypeRegistry::getNormalizedMIMEType(const String& mimeType)
|
| {
|
| return mimeType;
|
| }
|
| -#endif
|
| -
|
| -#if PLATFORM(BLACKBERRY)
|
| -typedef HashMap<String, String> MIMETypeAssociationMap;
|
| -
|
| -static const MIMETypeAssociationMap& mimeTypeAssociationMap()
|
| -{
|
| - static MIMETypeAssociationMap* mimeTypeMap = 0;
|
| - if (mimeTypeMap)
|
| - return *mimeTypeMap;
|
| -
|
| - mimeTypeMap = new MIMETypeAssociationMap;
|
| -
|
| - mimeTypeMap->add(ASCIILiteral("image/x-ms-bmp"), ASCIILiteral("image/bmp"));
|
| - mimeTypeMap->add(ASCIILiteral("image/x-windows-bmp"), ASCIILiteral("image/bmp"));
|
| - mimeTypeMap->add(ASCIILiteral("image/x-bmp"), ASCIILiteral("image/bmp"));
|
| - mimeTypeMap->add(ASCIILiteral("image/x-bitmap"), ASCIILiteral("image/bmp"));
|
| - mimeTypeMap->add(ASCIILiteral("image/x-ms-bitmap"), ASCIILiteral("image/bmp"));
|
| - mimeTypeMap->add(ASCIILiteral("image/jpg"), ASCIILiteral("image/jpeg"));
|
| - mimeTypeMap->add(ASCIILiteral("image/pjpeg"), ASCIILiteral("image/jpeg"));
|
| - mimeTypeMap->add(ASCIILiteral("image/x-png"), ASCIILiteral("image/png"));
|
| - mimeTypeMap->add(ASCIILiteral("image/vnd.rim.png"), ASCIILiteral("image/png"));
|
| - mimeTypeMap->add(ASCIILiteral("image/ico"), ASCIILiteral("image/vnd.microsoft.icon"));
|
| - mimeTypeMap->add(ASCIILiteral("image/icon"), ASCIILiteral("image/vnd.microsoft.icon"));
|
| - mimeTypeMap->add(ASCIILiteral("text/ico"), ASCIILiteral("image/vnd.microsoft.icon"));
|
| - mimeTypeMap->add(ASCIILiteral("application/ico"), ASCIILiteral("image/vnd.microsoft.icon"));
|
| - mimeTypeMap->add(ASCIILiteral("image/x-icon"), ASCIILiteral("image/vnd.microsoft.icon"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/vnd.qcelp"), ASCIILiteral("audio/qcelp"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/qcp"), ASCIILiteral("audio/qcelp"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/vnd.qcp"), ASCIILiteral("audio/qcelp"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/wav"), ASCIILiteral("audio/x-wav"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/mid"), ASCIILiteral("audio/midi"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/sp-midi"), ASCIILiteral("audio/midi"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/x-mid"), ASCIILiteral("audio/midi"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/x-midi"), ASCIILiteral("audio/midi"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/x-mpeg"), ASCIILiteral("audio/mpeg"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/mp3"), ASCIILiteral("audio/mpeg"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/x-mp3"), ASCIILiteral("audio/mpeg"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/mpeg3"), ASCIILiteral("audio/mpeg"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/x-mpeg3"), ASCIILiteral("audio/mpeg"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/mpg3"), ASCIILiteral("audio/mpeg"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/mpg"), ASCIILiteral("audio/mpeg"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/x-mpg"), ASCIILiteral("audio/mpeg"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/m4a"), ASCIILiteral("audio/mp4"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/x-m4a"), ASCIILiteral("audio/mp4"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/x-mp4"), ASCIILiteral("audio/mp4"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/x-aac"), ASCIILiteral("audio/aac"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/x-amr"), ASCIILiteral("audio/amr"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/mpegurl"), ASCIILiteral("audio/x-mpegurl"));
|
| - mimeTypeMap->add(ASCIILiteral("audio/flac"), ASCIILiteral("audio/x-flac"));
|
| - mimeTypeMap->add(ASCIILiteral("video/3gp"), ASCIILiteral("video/3gpp"));
|
| - mimeTypeMap->add(ASCIILiteral("video/avi"), ASCIILiteral("video/x-msvideo"));
|
| - mimeTypeMap->add(ASCIILiteral("video/x-m4v"), ASCIILiteral("video/mp4"));
|
| - mimeTypeMap->add(ASCIILiteral("video/x-quicktime"), ASCIILiteral("video/quicktime"));
|
| - mimeTypeMap->add(ASCIILiteral("application/java"), ASCIILiteral("application/java-archive"));
|
| - mimeTypeMap->add(ASCIILiteral("application/x-java-archive"), ASCIILiteral("application/java-archive"));
|
| - mimeTypeMap->add(ASCIILiteral("application/x-zip-compressed"), ASCIILiteral("application/zip"));
|
| - mimeTypeMap->add(ASCIILiteral("text/cache-manifest"), ASCIILiteral("text/plain"));
|
| -
|
| - return *mimeTypeMap;
|
| -}
|
| -
|
| -String MIMETypeRegistry::getNormalizedMIMEType(const String& mimeType)
|
| -{
|
| - MIMETypeAssociationMap::const_iterator it = mimeTypeAssociationMap().find(mimeType);
|
| -
|
| - if (it != mimeTypeAssociationMap().end())
|
| - return it->value;
|
| -
|
| - return mimeType;
|
| -}
|
| -#endif
|
|
|
| } // namespace WebCore
|
|
|