Changeset 57513 in webkit

Timestamp:

Apr 13, 2010 6:45:26 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-13 Stephan Aßmus <​superstippi@gmx.de>

Reviewed by David Levin.

Use the Haiku MIME type data base as a fall back for unknown file extensions.
​https://bugs.webkit.org/show_bug.cgi?id=34686

Covered by existing tests.

• platform/haiku/MIMETypeRegistryHaiku.cpp: (WebCore::):
  • fixed coding style issues

(WebCore::MIMETypeRegistry::getMIMETypeForExtension):

• fall back to the system MIME database for unknown types.
• return empty String as last resort, this is used elsewhere as indicator for unknown types.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/haiku/MIMETypeRegistryHaiku.cpp (modified) (6 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-13  Stephan Aßmus  <superstippi@gmx.de>
+
+        Reviewed by David Levin.
+
+        Use the Haiku MIME type data base as a fall back for unknown file extensions.
+        https://bugs.webkit.org/show_bug.cgi?id=34686
+
+        Covered by existing tests.
+
+        * platform/haiku/MIMETypeRegistryHaiku.cpp:
+        (WebCore::):
+            - fixed coding style issues
+        (WebCore::MIMETypeRegistry::getMIMETypeForExtension):
+            - fall back to the system MIME database for unknown types.
+            - return empty String as last resort, this is used
+              elsewhere as indicator for unknown types.
+
 2010-04-13  Stephan Aßmus  <superstippi@gmx.de>
 

trunk/WebCore/platform/haiku/MIMETypeRegistryHaiku.cpp

@@ -3 +3 @@
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2007 Trolltech ASA
+ * Copyright (C) 2010 Stephan Aßmus <superstippi@gmx.de>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30 +31 @@
 
 #include "PlatformString.h"
-
+#include <MimeType.h>
+#include <wtf/text/CString.h>
 
 namespace WebCore {
@@ -38 +40 @@
 };
 
-static const ExtensionMap extensionMap [] = {
+static const ExtensionMap extensionMap[] = {
     { "bmp", "image/bmp" },
     { "gif", "image/gif" },
     { "html", "text/html" },
-    { "ico", "image/x-icon" },   
+    { "ico", "image/x-icon" },
     { "jpeg", "image/jpeg" },
     { "jpg", "image/jpeg" },
@@ -59 +61 @@
 };
 
-// FIXME: Use the Haiku MIME registry
-String MIMETypeRegistry::getMIMETypeForExtension(const String &ext)
+String MIMETypeRegistry::getMIMETypeForExtension(const String& ext)
 {
     String str = ext.lower();
-    const ExtensionMap *extMap = extensionMap;
+
+    // Try WebCore built-in types.
+    const ExtensionMap* extMap = extensionMap;
     while (extMap->extension) {
         if (str == extMap->extension)
@@ -69 +72 @@
         ++extMap;
     }
-    // unknown, let's just assume plain text
-    return "text/plain";
+
+    // Try system mime database.
+    String fakeFileName("filename.");
+    fakeFileName.append(str);
+
+    BMimeType type;
+    if (BMimeType::GuessMimeType(fakeFileName.utf8().data(), &type) == B_OK)
+        return type.Type();
+
+    // unknown
+    return String();
 }
 
@@ -77 +89 @@
     return false;
 }
+
 } // namespace WebCore