[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 4d7dc69941438259a70d97ae88f3d6df4507379d
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 26 06:35:44 2010 +0000

    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
    
            Advertize audio/x-wav along with audio/wav when appropriate,
            otherwise WebKit attempts to use a plugin to play the media.
    
            * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
            (WebCore::mimeTypeCache):
    
    LayoutTests:
    
    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
    
            * platform/gtk/Skipped: Unskip fixed test on GTK port.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64031 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8bb9dd1..8fa6d09 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+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
+
+        * platform/gtk/Skipped: Unskip fixed test on GTK port.
+
 2010-07-25  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej Stachowiak.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 74c5baf..3caa851 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5639,9 +5639,6 @@ scrollbars/scrollbar-click-does-not-blur-content.html
 # multiple tests fail on different platforms, need to find the cause(s)
 fast/js/sputnik
 
-# https://bugs.webkit.org/show_bug.cgi?id=38376
-media/media-document-audio-size.html
-
 # https://bugs.webkit.org/show_bug.cgi?id=38509
 inspector/timeline-parse-html.html
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dacd9ef..b4426a5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+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
+
+        Advertize audio/x-wav along with audio/wav when appropriate,
+        otherwise WebKit attempts to use a plugin to play the media.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::mimeTypeCache):
+
 2010-07-25  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Kent Tamura.
diff --git a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index 7869c45..9eb8a16 100644
--- a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -1270,6 +1270,7 @@ static HashSet<String> mimeTypeCache()
 
                 if (g_str_equal(name, "audio/x-wav")) {
                     cache.add(String("audio/wav"));
+                    cache.add(String("audio/x-wav"));
                     cached = true;
                 }
 

-- 
WebKit Debian packaging