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

[philn at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1f7974290ed9759a8bc99fc687c4684f01c973a0
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 26 06:40:39 2010 +0000

    2010-07-23  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Eric Carlson.
    
            [GTK] media/media-can-play-mpeg-audio.html fails
            https://bugs.webkit.org/show_bug.cgi?id=42895
    
            Fixed advertizing of mp3, mpeg and mp4 mime-types in the player.
    
            * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
            (WebCore::mimeTypeCache):
    
    LayoutTests:
    
    2010-07-23  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Eric Carlson.
    
            [GTK] media/media-can-play-mpeg-audio.html fails
            https://bugs.webkit.org/show_bug.cgi?id=42895
    
            * platform/gtk/Skipped: Unskip fixed test.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64032 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8fa6d09..2ff6263 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Eric Carlson.
 
+        [GTK] media/media-can-play-mpeg-audio.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=42895
+
+        * platform/gtk/Skipped: Unskip fixed test.
+
+2010-07-23  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Eric Carlson.
+
         LayoutTests/media/media-document-audio-size.html failure
         https://bugs.webkit.org/show_bug.cgi?id=38376
 
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 3caa851..b129314 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -3328,9 +3328,6 @@ media/media-captions.html
 # https://bugs.webkit.org/show_bug.cgi?id=33541 - Need platform specific results
 media/video-poster-scale.html
 
-# don't play mp3 files
-media/media-can-play-mpeg-audio.html
-
 # Tests in plugins/ directory
 #   Tests failing
 plugins/embed-attributes-setting.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b4426a5..8d71de1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Eric Carlson.
 
+        [GTK] media/media-can-play-mpeg-audio.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=42895
+
+        Fixed advertizing of mp3, mpeg and mp4 mime-types in the player.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::mimeTypeCache):
+
+2010-07-23  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Eric Carlson.
+
         LayoutTests/media/media-document-audio-size.html failure
         https://bugs.webkit.org/show_bug.cgi?id=38376
 
diff --git a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index 9eb8a16..7184439 100644
--- a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -1255,6 +1255,7 @@ static HashSet<String> mimeTypeCache()
                     || g_str_equal(name, "audio/x-m4a")) {
                     cache.add(String("video/mp4"));
                     cache.add(String("audio/aac"));
+                    cache.add(String("audio/mp4"));
                     cached = true;
                 }
 
@@ -1276,6 +1277,7 @@ static HashSet<String> mimeTypeCache()
 
                 if (g_str_equal(name, "audio/mpeg")) {
                     cache.add(String(name));
+                    cache.add(String("audio/x-mpeg"));
                     cached = true;
 
                     // This is what we are handling:
@@ -1290,8 +1292,10 @@ static HashSet<String> mimeTypeCache()
                                 cache.add(String("audio/mp1"));
                             if (minLayer <= 2 && 2 <= maxLayer)
                                 cache.add(String("audio/mp2"));
-                            if (minLayer <= 3 && 3 <= maxLayer)
+                            if (minLayer <= 3 && 3 <= maxLayer) {
+                                cache.add(String("audio/x-mp3"));
                                 cache.add(String("audio/mp3"));
+                            }
                         }
                     }
                 }

-- 
WebKit Debian packaging