[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 0977c694f407b6a963ae577821600fd04454f809
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 17 06:48:24 2010 +0000

    2010-08-17  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GStreamer] media/invalid-media-url-crash.html fails
            https://bugs.webkit.org/show_bug.cgi?id=42960
    
            Implemented two ResourceHandleClient callbacks that need to notify
            downstream GStreamer elements of errors while accessing the
            resource.
    
            * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
            (StreamingClient::wasBlocked):
            (StreamingClient::cannotShowURL):
    
    LayoutTests:
    
    2010-08-17  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GStreamer] media/invalid-media-url-crash.html fails
            https://bugs.webkit.org/show_bug.cgi?id=42960
    
            * platform/gtk/Skipped: Unskip fixed test
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65486 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 696d80b..0b3638a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-17  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GStreamer] media/invalid-media-url-crash.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=42960
+
+        * platform/gtk/Skipped: Unskip fixed test
+
 2010-08-16  Yuta Kitamura  <yutak at chromium.org>
 
         Unreviewed test expectation update.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 8f56138..4ebc04c 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -44,7 +44,6 @@ http/tests/xmlhttprequest/XMLHttpRequestException.html
 http/tests/xmlhttprequest/connection-error-sync.html
 fast/xmlhttprequest/null-document-xmlhttprequest-open.html
 http/tests/misc/favicon-as-image.html
-media/invalid-media-url-crash.html
 media/unsupported-rtsp.html
 security/autocomplete-cleared-on-back.html
 http/tests/security/frameNavigation/cross-origin-opener.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 060bbe5..ef8a91b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-17  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GStreamer] media/invalid-media-url-crash.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=42960
+
+        Implemented two ResourceHandleClient callbacks that need to notify
+        downstream GStreamer elements of errors while accessing the
+        resource.
+
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (StreamingClient::wasBlocked):
+        (StreamingClient::cannotShowURL):
+
 2010-08-16  Gavin Barraclough  <barraclough at apple.com>
 
         Rubber stamped by Sam Weinig
diff --git a/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
index d3b5f1b..1059b59 100644
--- a/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
+++ b/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
@@ -780,9 +780,13 @@ void StreamingClient::didFail(ResourceHandle*, const ResourceError& error)
 
 void StreamingClient::wasBlocked(ResourceHandle*)
 {
+    GST_ERROR_OBJECT(m_src, "Request was blocked");
+    GST_ELEMENT_ERROR(m_src, RESOURCE, OPEN_READ, ("Access to \"%s\" was blocked", m_src->priv->uri), (0));
 }
 
 void StreamingClient::cannotShowURL(ResourceHandle*)
 {
+    GST_ERROR_OBJECT(m_src, "Cannot show URL");
+    GST_ELEMENT_ERROR(m_src, RESOURCE, OPEN_READ, ("Can't show \"%s\"", m_src->priv->uri), (0));
 }
 

-- 
WebKit Debian packaging