[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 73a70359b7aa91aa9022d5675a8fe59b9580488d
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 9 15:03:01 2010 +0000

            Reviewed by Martin Robinson.
    
            [GTK] testmimehandling falsely succeeds testing Ogg mime type
            https://bugs.webkit.org/show_bug.cgi?id=45349
    
            Advertize audio/x-vorbis+ogg so MediaDocuments loading local ogg
            files work as well.
    
            * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
            (WebCore::mimeTypeCache):
    
    WebKit/gtk:
    
            Reviewed by Martin Robinson.
    
            [GTK] testmimehandling falsely succeeds testing Ogg mime type
            https://bugs.webkit.org/show_bug.cgi?id=45349
    
            Make this actually test an ogg file request instead of pdf and
            changed the expected result to match libsoup content-sniffing
            result in the case of ogg/vorbis file.
    
            * tests/testmimehandling.c:
            (mime_type_policy_decision_requested_cb):
            (test_mime_ogg):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67086 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 169448c..3d1fcab 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-09  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] testmimehandling falsely succeeds testing Ogg mime type
+        https://bugs.webkit.org/show_bug.cgi?id=45349
+
+        Advertize audio/x-vorbis+ogg so MediaDocuments loading local ogg
+        files work as well.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::mimeTypeCache):
+
 2010-09-09  Adam Barth  <abarth at webkit.org>
 
         Move FTPDirectoryDocument, ImageDocument, MediaDocument, and
diff --git a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index 513f3c2..4791b4c 100644
--- a/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -1267,6 +1267,7 @@ static HashSet<String> mimeTypeCache()
 
                 if (g_str_equal(name, "audio/x-vorbis")) {
                     cache.add(String("audio/ogg"));
+                    cache.add(String("audio/x-vorbis+ogg"));
                     cached = true;
                 }
 
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index c798b02..a8360f3 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-09  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] testmimehandling falsely succeeds testing Ogg mime type
+        https://bugs.webkit.org/show_bug.cgi?id=45349
+
+        Make this actually test an ogg file request instead of pdf and
+        changed the expected result to match libsoup content-sniffing
+        result in the case of ogg/vorbis file.
+
+        * tests/testmimehandling.c:
+        (mime_type_policy_decision_requested_cb):
+        (test_mime_ogg):
+
 2010-09-08  Mario Sanchez Prada  <msanchez at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebKit/gtk/tests/testmimehandling.c b/WebKit/gtk/tests/testmimehandling.c
index 2ab0257..3a0eded 100644
--- a/WebKit/gtk/tests/testmimehandling.c
+++ b/WebKit/gtk/tests/testmimehandling.c
@@ -125,7 +125,7 @@ static gboolean mime_type_policy_decision_requested_cb(WebKitWebView* view, WebK
         g_assert_cmpstr(mime_type, ==, "text/plain");
         g_assert(webkit_web_view_can_show_mime_type(view, mime_type));
     } else if (g_str_equal(type, "ogg")) {
-        g_assert_cmpstr(mime_type, ==, "audio/ogg");
+        g_assert_cmpstr(mime_type, ==, "audio/x-vorbis+ogg");
         g_assert(webkit_web_view_can_show_mime_type(view, mime_type));
     }
 
@@ -172,7 +172,7 @@ static void test_mime_text()
 
 static void test_mime_ogg()
 {
-    test_mime_type("pdf");
+    test_mime_type("ogg");
 }
 
 int main(int argc, char** argv)

-- 
WebKit Debian packaging