[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 542b6fc3e8a000530233a664b172b52ec2c8a393
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 27 10:00:24 2011 +0000

    2011-01-27  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r76773.
            http://trac.webkit.org/changeset/76773
            https://bugs.webkit.org/show_bug.cgi?id=53230
    
            breaks multiple GTK media tests (Requested by philn-tp on
            #webkit).
    
            * platform/gtk/Skipped:
    2011-01-27  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r76773.
            http://trac.webkit.org/changeset/76773
            https://bugs.webkit.org/show_bug.cgi?id=53230
    
            breaks multiple GTK media tests (Requested by philn-tp on
            #webkit).
    
            * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
            (WebCore::mimeTypeCache):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76777 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index cf40d0a..280c024 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-27  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r76773.
+        http://trac.webkit.org/changeset/76773
+        https://bugs.webkit.org/show_bug.cgi?id=53230
+
+        breaks multiple GTK media tests (Requested by philn-tp on
+        #webkit).
+
+        * platform/gtk/Skipped:
+
 2011-01-27  Yuzo Fujishima  <yuzo at google.com>
 
         Unreviewed Chromium test expectaion change.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 457867d..6c563f3 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5093,3 +5093,6 @@ 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 0f6d07c..c5d383f 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,17 @@
 2011-01-27  Sheriff Bot  <webkit.review.bot at gmail.com>
 
+        Unreviewed, rolling out r76773.
+        http://trac.webkit.org/changeset/76773
+        https://bugs.webkit.org/show_bug.cgi?id=53230
+
+        breaks multiple GTK media tests (Requested by philn-tp on
+        #webkit).
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::mimeTypeCache):
+
+2011-01-27  Sheriff Bot  <webkit.review.bot at gmail.com>
+
         Unreviewed, rolling out r76770.
         http://trac.webkit.org/changeset/76770
         https://bugs.webkit.org/show_bug.cgi?id=53229
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index 15f7e63..c113c69 100644
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -1384,15 +1384,11 @@ static HashSet<String> mimeTypeCache()
 
                 // These formats are supported by GStreamer, but not
                 // correctly advertised.
-                if (g_str_equal(name, "video/x-h264")) {
+                if (g_str_equal(name, "video/x-h264")
+                    || g_str_equal(name, "audio/x-m4a")) {
                     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