[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[philn at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f6bc6af1626e008d2693cc7e8f1eeb1c6126ebfc
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 6 21:37:40 2010 +0000

    2010-12-06  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GStreamer] use ResourceHandle::setDefersLoading in WebKitWebSourceGStreamer
            https://bugs.webkit.org/show_bug.cgi?id=44157
    
            * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
            (webKitWebSrcNeedDataMainCb):
            (webKitWebSrcEnoughDataMainCb): Replaced platform-specific code
            with cross-platform ResourceHandle::setDefersLoading calls.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73396 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3ad946f..b8c9224 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-06  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GStreamer] use ResourceHandle::setDefersLoading in WebKitWebSourceGStreamer
+        https://bugs.webkit.org/show_bug.cgi?id=44157
+
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (webKitWebSrcNeedDataMainCb):
+        (webKitWebSrcEnoughDataMainCb): Replaced platform-specific code
+        with cross-platform ResourceHandle::setDefersLoading calls.
+
 2010-12-06  Ryosuke Niwa  <rniwa at webkit.org>
 
         Unreviewed Leopard build fix for r73388.
diff --git a/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
index 635feff..246dea0 100644
--- a/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
+++ b/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
@@ -541,13 +541,7 @@ static gboolean webKitWebSrcNeedDataMainCb(WebKitWebSrc* src)
 {
     WebKitWebSrcPrivate* priv = src->priv;
 
-#if USE(NETWORK_SOUP)
-    ResourceHandleInternal* d = priv->resourceHandle->getInternal();
-    if (d->m_msg)
-        soup_session_unpause_message(ResourceHandle::defaultSession(), d->m_msg);
-#endif
-    // Ports not using libsoup need to call the unpause/schedule API of their
-    // underlying network implementation here.
+    priv->resourceHandle->setDefersLoading(false);
 
     GST_OBJECT_LOCK(src);
     priv->paused = FALSE;
@@ -577,12 +571,7 @@ static gboolean webKitWebSrcEnoughDataMainCb(WebKitWebSrc* src)
 {
     WebKitWebSrcPrivate* priv = src->priv;
 
-#if USE(NETWORK_SOUP)
-    ResourceHandleInternal* d = priv->resourceHandle->getInternal();
-    soup_session_pause_message(ResourceHandle::defaultSession(), d->m_msg);
-#endif
-    // Ports not using libsoup need to call the pause/unschedule API of their
-    // underlying network implementation here.
+    priv->resourceHandle->setDefersLoading(true);
 
     GST_OBJECT_LOCK(src);
     priv->paused = TRUE;

-- 
WebKit Debian packaging