[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c81af1a6a0aa4f94427236fe666d2dfd2de1ccb7
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 19:53:07 2010 +0000

    2010-10-27  Crystal Zhang  <haizhang at rim.com>
    
            Reviewed by Eric Carlson.
    
            https://bugs.webkit.org/show_bug.cgi?id=48446
    
            Fix an issue where we were passing the wrong parameter
            to MIMETypeRegistry::getMIMETypeForExtension().
    
            * platform/MIMETypeRegistry.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70695 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 87afbec..469745b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-27  Crystal Zhang  <haizhang at rim.com>
+
+        Reviewed by Eric Carlson.
+
+        https://bugs.webkit.org/show_bug.cgi?id=48446
+
+        Fix an issue where we were passing the wrong parameter
+        to MIMETypeRegistry::getMIMETypeForExtension().
+
+        * platform/MIMETypeRegistry.cpp:
+
 2010-10-27  David Hyatt  <hyatt at apple.com>
 
         Reviewed by Beth Dakin.
diff --git a/WebCore/platform/MIMETypeRegistry.cpp b/WebCore/platform/MIMETypeRegistry.cpp
index 2002018..ca98f9b 100644
--- a/WebCore/platform/MIMETypeRegistry.cpp
+++ b/WebCore/platform/MIMETypeRegistry.cpp
@@ -329,7 +329,7 @@ static MediaMIMETypeMap& mediaMIMETypeMap()
 
             // If there is a system specific type for this extension, add it as the first type so
             // getMediaMIMETypeForExtension will always return it.
-            String systemType = MIMETypeRegistry::getMIMETypeForExtension(pairs[ndx].type);
+            String systemType = MIMETypeRegistry::getMIMETypeForExtension(pairs[ndx].extension);
             if (!systemType.isEmpty() && pairs[ndx].type != systemType)
                 synonyms->append(systemType);
             synonyms->append(pairs[ndx].type);

-- 
WebKit Debian packaging