[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 3ae7f711e32a1d2b28c3b735e2af0a7f26191ac1
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 1 15:54:59 2009 +0000

    2009-11-01  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Eric Seidel.
    
            https://bugs.webkit.org/show_bug.cgi?id=30586
            [GTK] Failing test media/video-src-empty.html
    
            * platform/gtk/Skipped: Unskip fixed test.
    2009-11-01  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Eric Seidel.
    
            https://bugs.webkit.org/show_bug.cgi?id=30586
            [GTK] Failing test media/video-src-empty.html
    
            Correctly set network/ready state depending on GStreamer errors
            received on the bus.
    
            * platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp:
            (WebCore::mediaPlayerPrivateMessageCallback):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50385 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a4b9fbe..bc6efc7 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-01  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30586
+        [GTK] Failing test media/video-src-empty.html
+
+        * platform/gtk/Skipped: Unskip fixed test.
+
 2009-10-31  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Jon Honeycutt.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 868db88..0fb5053 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5528,9 +5528,6 @@ media/video-played-reset.html
 # https://bugs.webkit.org/show_bug.cgi?id=30680
 media/audio-delete-while-step-button-clicked.html
 
-# https://bugs.webkit.org/show_bug.cgi?id=30586
-media/video-src-empty.html
-
 # https://bugs.webkit.org/show_bug.cgi?id=30594
 fast/dom/Window/window-properties.html
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 23f24fe..f23a322 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-01  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30586
+        [GTK] Failing test media/video-src-empty.html
+
+        Correctly set network/ready state depending on GStreamer errors
+        received on the bus.
+
+        * platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::mediaPlayerPrivateMessageCallback):
+
 2009-10-31  Oliver Hunt  <oliver at apple.com>
 
         Build fix
diff --git a/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp b/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
index 42d8b15..668805d 100644
--- a/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
+++ b/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
@@ -66,11 +66,15 @@ gboolean mediaPlayerPrivateMessageCallback(GstBus* bus, GstMessage* message, gpo
         LOG_VERBOSE(Media, "Error: %d, %s", err->code,  err->message);
 
         error = MediaPlayer::Empty;
-        if (err->domain == GST_CORE_ERROR || err->domain == GST_LIBRARY_ERROR)
-            error = MediaPlayer::DecodeError;
-        else if (err->domain == GST_RESOURCE_ERROR)
+        if (err->code == GST_STREAM_ERROR_CODEC_NOT_FOUND ||
+            err->code == GST_STREAM_ERROR_WRONG_TYPE ||
+            err->code == GST_STREAM_ERROR_FAILED ||
+            err->code == GST_CORE_ERROR_MISSING_PLUGIN ||
+            err->code == GST_RESOURCE_ERROR_NOT_FOUND)
             error = MediaPlayer::FormatError;
         else if (err->domain == GST_STREAM_ERROR)
+            error = MediaPlayer::DecodeError;
+        else if (err->domain == GST_RESOURCE_ERROR)
             error = MediaPlayer::NetworkError;
 
         if (mp)

-- 
WebKit Debian packaging