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

[eric.carlson at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 4e8b9e6482bb30f8c76eac7aaa5cee31d24aa892
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 28 20:10:38 2010 +0000

    2010-08-28  Eric Carlson  <eric.carlson at apple.com>
    
            Reviewed by Dan Bernstein.
    
            Add WebM MIME types to type registry
            https://bugs.webkit.org/show_bug.cgi?id=44826
    
            * platform/MIMETypeRegistry.cpp:
            (WebCore::TypeExtensionPair::): Add "video/webm" and "audio/webm" types.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66313 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 76b3a55..36ab21f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,15 @@
 2010-08-28  Eric Carlson  <eric.carlson at apple.com>
 
+        Reviewed by Dan Bernstein.
+
+        Add WebM MIME types to type registry
+        https://bugs.webkit.org/show_bug.cgi?id=44826
+
+        * platform/MIMETypeRegistry.cpp:
+        (WebCore::TypeExtensionPair::): Add "video/webm" and "audio/webm" types.
+
+2010-08-28  Eric Carlson  <eric.carlson at apple.com>
+
         Reviewed by Simon Fraser.
 
         Crash reloading fast/events/tabindex-focus-blur-all.html test
diff --git a/WebCore/platform/MIMETypeRegistry.cpp b/WebCore/platform/MIMETypeRegistry.cpp
index 1b75fba..9842d8c 100644
--- a/WebCore/platform/MIMETypeRegistry.cpp
+++ b/WebCore/platform/MIMETypeRegistry.cpp
@@ -253,6 +253,10 @@ static MediaMIMETypeMap& mediaMIMETypeMap()
         { "video/annodex", "axv" },
         { "audio/speex", "spx" },
 
+        // WebM
+        { "video/webm", "webm" },
+        { "audio/webm", "webm" },
+
         // MPEG
         { "audio/mpeg", "m1a" },
         { "audio/mpeg", "m2a" },

-- 
WebKit Debian packaging