[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[philn at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 3bb4744a8149ea6e0a9859cf29aee7de64573730
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 27 08:55:04 2011 +0000

    2011-01-26  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GTK] LayoutTests/media/audio-mpeg4-supported.html fails
            https://bugs.webkit.org/show_bug.cgi?id=53125
    
            * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
            (WebCore::mimeTypeCache): Add audio/x-m4a mimetype in the cache.
    
    2011-01-26  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GTK] LayoutTests/media/audio-mpeg4-supported.html fails
            https://bugs.webkit.org/show_bug.cgi?id=53125
    
            * platform/gtk/Skipped: Unskip fixed test.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76773 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b94114e..5867469 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-26  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] LayoutTests/media/audio-mpeg4-supported.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=53125
+
+        * platform/gtk/Skipped: Unskip fixed test.
+
 2011-01-27  Philippe Normand  <pnormand at igalia.com>
 
         Unreviewed, updated GTK baselines after r76726.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 6c563f3..457867d 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5093,6 +5093,3 @@ http/tests/xmlhttprequest/simple-cross-origin-denied-events-sync.html
 http/tests/xmlhttprequest/simple-cross-origin-denied-events.html
 http/tests/xmlhttprequest/simple-cross-origin-denied-events-post-sync.html
 
-# This media test fails; possibly because the AAC codec is not installed on the test bots:
-# https://bugs.webkit.org/show_bug.cgi?id=53125
-media/audio-mpeg4-supported.html
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b3cf2c5..cd6b0d9 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-26  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] LayoutTests/media/audio-mpeg4-supported.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=53125
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::mimeTypeCache): Add audio/x-m4a mimetype in the cache.
+
 2011-01-26  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index c113c69..15f7e63 100644
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -1384,11 +1384,15 @@ static HashSet<String> mimeTypeCache()
 
                 // These formats are supported by GStreamer, but not
                 // correctly advertised.
-                if (g_str_equal(name, "video/x-h264")
-                    || g_str_equal(name, "audio/x-m4a")) {
+                if (g_str_equal(name, "video/x-h264")) {
                     cache.add(String("video/mp4"));
+                    cached = true;
+                }
+
+                if (g_str_equal(name, "audio/x-m4a")) {
                     cache.add(String("audio/aac"));
                     cache.add(String("audio/mp4"));
+                    cache.add(String("audio/x-m4a"));
                     cached = true;
                 }
 

-- 
WebKit Debian packaging