Changeset 135507 in webkit

Timestamp:

Nov 22, 2012 5:23:28 AM (11 years ago)

Author:

allan.jensen@digia.com

Message:

[Qt] Lookup mimetypes using QMimeDatabase
​https://bugs.webkit.org/show_bug.cgi?id=102667

Reviewed by Simon Hausmann.

The Qt backend of MIMETypeRegistry now looks up using QMimeDatabase.

• loader/archive/ArchiveFactory.cpp:

(WebCore::archiveMIMETypes):

Also map the preferred freedesktop mimetype for MIME archives to MIME archive constructor.

• platform/MIMETypeRegistry.cpp:

(WebCore::MIMETypeRegistry::getNormalizedMIMEType):

• platform/qt/MIMETypeRegistryQt.cpp:

(WebCore::MIMETypeRegistry::getMIMETypeForExtension):
(WebCore::MIMETypeRegistry::getMIMETypeForPath):
(WebCore::MIMETypeRegistry::getNormalizedMIMEType):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/archive/ArchiveFactory.cpp (modified) (1 diff)
• platform/MIMETypeRegistry.cpp (modified) (4 diffs)
• platform/qt/MIMETypeRegistryQt.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-22  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] Lookup mimetypes using QMimeDatabase
+        https://bugs.webkit.org/show_bug.cgi?id=102667
+
+        Reviewed by Simon Hausmann.
+
+        The Qt backend of MIMETypeRegistry now looks up using QMimeDatabase.
+
+        * loader/archive/ArchiveFactory.cpp:
+        (WebCore::archiveMIMETypes):
+            Also map the preferred freedesktop mimetype for MIME archives to MIME archive constructor.
+        * platform/MIMETypeRegistry.cpp:
+        (WebCore::MIMETypeRegistry::getNormalizedMIMEType):
+        * platform/qt/MIMETypeRegistryQt.cpp:
+        (WebCore::MIMETypeRegistry::getMIMETypeForExtension):
+        (WebCore::MIMETypeRegistry::getMIMETypeForPath):
+        (WebCore::MIMETypeRegistry::getNormalizedMIMEType):
+
 2012-11-22  Cosmin Truta  <ctruta@rim.com>
 

trunk/Source/WebCore/loader/archive/ArchiveFactory.cpp

@@ -71 +71 @@
 #if PLATFORM(GTK)
     mimeTypes.set("message/rfc822", archiveFactoryCreate<MHTMLArchive>);
+#elif PLATFORM(QT)
+    mimeTypes.set("application/x-mimearchive", archiveFactoryCreate<MHTMLArchive>);
 #endif
 #endif

trunk/Source/WebCore/platform/MIMETypeRegistry.cpp

@@ -492 +492 @@
 }
 
+#if !PLATFORM(QT)
 String MIMETypeRegistry::getMIMETypeForPath(const String& path)
 {
@@ -501 +502 @@
             return result;
     }
-    return "application/octet-stream";
-}
+    return defaultMIMEType();
+}
+#endif
 
 bool MIMETypeRegistry::isSupportedImageMIMEType(const String& mimeType)
@@ -638 +640 @@
     return defaultMIMEType;
 }
+
+#if !PLATFORM(QT) && !PLATFORM(BLACKBERRY)
+String MIMETypeRegistry::getNormalizedMIMEType(const String& mimeType)
+{
+    return mimeType;
+}
+#endif
 
 #if PLATFORM(BLACKBERRY)
@@ -697 +706 @@
     return *mimeTypeMap;
 }
-#endif
 
 String MIMETypeRegistry::getNormalizedMIMEType(const String& mimeType)
 {
-#if PLATFORM(BLACKBERRY)
     MIMETypeAssociationMap::const_iterator it = mimeTypeAssociationMap().find(mimeType);
 
     if (it != mimeTypeAssociationMap().end())
         return it->value;
-#endif
+
     return mimeType;
 }
-
+#endif
 
 } // namespace WebCore

trunk/Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp

@@ -30 +30 @@
 #include "MIMETypeRegistry.h"
 
+#include <QMimeDatabase>
 #include <wtf/Assertions.h>
 #include <wtf/MainThread.h>
@@ -35 +36 @@
 namespace WebCore {
 
-struct ExtensionMap {
-    const char* extension;
-    const char* mimeType;
-};
-
-static const ExtensionMap extensionMap[] = {
-    { "bmp", "image/bmp" },
-    { "css", "text/css" },
-    { "gif", "image/gif" },
-    { "html", "text/html" },
-    { "htm", "text/html" },
-    { "ico", "image/x-icon" },
-    { "jpeg", "image/jpeg" },
-    { "jpg", "image/jpeg" },
-    { "js", "application/x-javascript" },
-    { "mng", "video/x-mng" },
-    { "mp4", "video/mp4" },
-    { "m4v", "video/mp4" },
-    { "m4a", "audio/x-m4a" },
-    { "mht", "multipart/related" },
-    { "mhtml", "multipart/related" },
-    { "mp3", "audio/mp3" },
-    { "ogv", "video/ogg" },
-    { "oga", "audio/ogg" },
-    { "ogm", "audio/ogg" },
-    { "ogg", "audio/ogg" },
-    { "webm", "video/webm" },
-    { "webm", "audio/webm" },
-    { "wav", "audio/wav" },
-    { "mov", "video/quicktime" },
-    { "pbm", "image/x-portable-bitmap" },
-    { "pgm", "image/x-portable-graymap" },
-    { "pdf", "application/pdf" },
-    { "png", "image/png" },
-    { "ppm", "image/x-portable-pixmap" },
-    { "rss", "application/rss+xml" },
-    { "svg", "image/svg+xml" },
-    { "text", "text/plain" },
-    { "tif", "image/tiff" },
-    { "tiff", "image/tiff" },
-    { "txt", "text/plain" },
-    { "xbm", "image/x-xbitmap" },
-    { "xml", "text/xml" },
-    { "xpm", "image/x-xpm" },
-    { "xsl", "text/xsl" },
-    { "xhtml", "application/xhtml+xml" },
-    { "wml", "text/vnd.wap.wml" },
-    { "wmlc", "application/vnd.wap.wmlc" },
-    { 0, 0 }
-};
-
 String MIMETypeRegistry::getMIMETypeForExtension(const String &ext)
 {
-    ASSERT(isMainThread());
+    // QMimeDatabase lacks the ability to query by extension alone, so we create a fake filename to lookup.
+    const QString filename = QStringLiteral("filename.") + QString(ext.lower());
 
-    String s = ext.lower();
-
-    const ExtensionMap *e = extensionMap;
-    while (e->extension) {
-        if (s == e->extension)
-            return e->mimeType;
-        ++e;
-    }
+    QMimeType mimeType = QMimeDatabase().mimeTypeForFile(filename, QMimeDatabase::MatchExtension);
+    if (mimeType.isValid() && !mimeType.isDefault())
+        return mimeType.name();
 
     return String();
+}
+
+String MIMETypeRegistry::getMIMETypeForPath(const String& path)
+{
+    QMimeType type = QMimeDatabase().mimeTypeForFile(path, QMimeDatabase::MatchExtension);
+    if (type.isValid())
+        return type.name();
+
+    return defaultMIMEType();
+}
+
+String MIMETypeRegistry::getNormalizedMIMEType(const String& mimeTypeName)
+{
+    // This looks up the mime type object by preferred name or alias, and returns the preferred name.
+    QMimeType mimeType = QMimeDatabase().mimeTypeForName(mimeTypeName);
+    if (mimeType.isValid() && !mimeType.isDefault())
+        return mimeType.name();
+
+    return mimeTypeName;
 }