Changeset 72119 in webkit

Timestamp:

Nov 16, 2010 10:44:46 AM (13 years ago)

Author:

eric.carlson@apple.com

Message:

2010-11-16 Eric Carlson <​eric.carlson@apple.com>

Reviewed by John Sullivan.

getMIMEType(s)ForExtension should consult system mapping
​https://bugs.webkit.org/show_bug.cgi?id=49497

No new tests possible.

• platform/MIMETypeRegistry.cpp: (WebCore::MIMETypeRegistry::getMediaMIMETypeForExtension): Add the type returned by getMIMETypeForExtension. Put the result of mediaMIMETypeMap().get() in a local variable and test instead of calling constains() and then get(). (WebCore::MIMETypeRegistry::getMediaMIMETypesForExtension): Ditto.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/MIMETypeRegistry.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-16  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by John Sullivan.
+
+        getMIMEType(s)ForExtension should consult system mapping
+        https://bugs.webkit.org/show_bug.cgi?id=49497
+
+        No new tests possible.
+
+        * platform/MIMETypeRegistry.cpp:
+        (WebCore::MIMETypeRegistry::getMediaMIMETypeForExtension): Add the type returned by getMIMETypeForExtension. 
+        Put the result of mediaMIMETypeMap().get() in a local variable and test instead of calling
+        constains() and then get().
+        (WebCore::MIMETypeRegistry::getMediaMIMETypesForExtension): Ditto.
+
 2010-11-16  Eric Carlson  <eric.carlson@apple.com>
 

trunk/WebCore/platform/MIMETypeRegistry.cpp

@@ -346 +346 @@
 String MIMETypeRegistry::getMediaMIMETypeForExtension(const String& ext)
 {
-    if (mediaMIMETypeMap().contains(ext))
-        return (*mediaMIMETypeMap().get(ext))[0];
+    // Look in the system-specific registry first.
+    String type = getMIMETypeForExtension(ext);
+    if (!type.isEmpty())
+        return type;
+
+    Vector<String>* typeList = mediaMIMETypeMap().get(ext);
+    if (typeList)
+        return (*typeList)[0];
     
     return String();
@@ -354 +360 @@
 Vector<String> MIMETypeRegistry::getMediaMIMETypesForExtension(const String& ext)
 {
-    if (mediaMIMETypeMap().contains(ext))
-        return *mediaMIMETypeMap().get(ext);
-
+    Vector<String>* typeList = mediaMIMETypeMap().get(ext);
+    if (typeList)
+        return *typeList;
+
+    // Only need to look in the system-specific registry if mediaMIMETypeMap() doesn't contain
+    // the extension at all, because it always contains the system-specific type if the
+    // extension is in the static mapping table.
+    String type = getMIMETypeForExtension(ext);
+    if (!type.isEmpty()) {
+        Vector<String> typeList;
+        typeList.append(type);
+        return typeList;
+    }
+    
     return Vector<String>();
 }