<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[56615] trunk/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/56615">56615</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2010-03-26 01:58:45 -0700 (Fri, 26 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>2010-03-08  Philippe Normand  &lt;pnormand@igalia.com&gt;

        Reviewed by Gustavo Noronha.

        [GStreamer] soften dependency on libsoup in the http src element
        https://bugs.webkit.org/show_bug.cgi?id=35864

        Replaced SoupURI calls with KURL and pause/resume internal soup
        messages only if the element is compiled for a port depending on
        libsoup.

        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
        (webkit_web_src_init):
        (webKitWebSrcSetUri):
        (webKitWebSrcNeedDataMainCb):
        (webKitWebSrcEnoughDataMainCb):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp">trunk/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (56614 => 56615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-03-26 08:45:28 UTC (rev 56614)
+++ trunk/WebCore/ChangeLog        2010-03-26 08:58:45 UTC (rev 56615)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2010-03-08  Philippe Normand  &lt;pnormand@igalia.com&gt;
+
+        Reviewed by Gustavo Noronha.
+
+        [GStreamer] soften dependency on libsoup in the http src element
+        https://bugs.webkit.org/show_bug.cgi?id=35864
+
+        Replaced SoupURI calls with KURL and pause/resume internal soup
+        messages only if the element is compiled for a port depending on
+        libsoup.
+
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        (webkit_web_src_init):
+        (webKitWebSrcSetUri):
+        (webKitWebSrcNeedDataMainCb):
+        (webKitWebSrcEnoughDataMainCb):
+
</ins><span class="cx"> 2010-03-25  Ilya Tikhonovsky  &lt;loislo@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Pavel Feldman.
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (56614 => 56615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp        2010-03-26 08:45:28 UTC (rev 56614)
+++ trunk/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp        2010-03-26 08:58:45 UTC (rev 56615)
</span><span class="lines">@@ -255,6 +255,7 @@
</span><span class="cx">     // already if the queue is 20% empty, it's much more
</span><span class="cx">     // likely that libsoup already provides new data before
</span><span class="cx">     // the queue is really empty.
</span><ins>+    // This might need tweaking for ports not using libsoup.
</ins><span class="cx">     if (priv-&gt;haveAppSrc27)
</span><span class="cx">         g_object_set(priv-&gt;appsrc, &quot;min-percent&quot;, 20, NULL);
</span><span class="cx"> 
</span><span class="lines">@@ -505,17 +506,14 @@
</span><span class="cx">     if (!uri)
</span><span class="cx">         return TRUE;
</span><span class="cx"> 
</span><del>-    SoupURI* soupUri = soup_uri_new(uri);
</del><ins>+    KURL url(KURL(), uri);
</ins><span class="cx"> 
</span><del>-    if (!soupUri || !SOUP_URI_VALID_FOR_HTTP(soupUri)) {
</del><ins>+    if (!url.isValid() || !url.protocolInHTTPFamily()) {
</ins><span class="cx">         GST_ERROR_OBJECT(src, &quot;Invalid URI '%s'&quot;, uri);
</span><del>-        soup_uri_free(soupUri);
</del><span class="cx">         return FALSE;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    priv-&gt;uri = soup_uri_to_string(soupUri, FALSE);
-    soup_uri_free(soupUri);
-
</del><ins>+    priv-&gt;uri = g_strdup(url.string().utf8().data());
</ins><span class="cx">     return TRUE;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -535,9 +533,13 @@
</span><span class="cx"> {
</span><span class="cx">     WebKitWebSrcPrivate* priv = src-&gt;priv;
</span><span class="cx"> 
</span><ins>+#if USE(NETWORK_SOUP)
</ins><span class="cx">     ResourceHandleInternal* d = priv-&gt;resourceHandle-&gt;getInternal();
</span><span class="cx">     if (d-&gt;m_msg)
</span><span class="cx">         soup_session_unpause_message(ResourceHandle::defaultSession(), d-&gt;m_msg);
</span><ins>+#endif
+    // Ports not using libsoup need to call the unpause/schedule API of their
+    // underlying network implementation here.
</ins><span class="cx"> 
</span><span class="cx">     priv-&gt;paused = FALSE;
</span><span class="cx">     priv-&gt;needDataID = 0;
</span><span class="lines">@@ -560,9 +562,13 @@
</span><span class="cx"> {
</span><span class="cx">     WebKitWebSrcPrivate* priv = src-&gt;priv;
</span><span class="cx"> 
</span><ins>+#if USE(NETWORK_SOUP)
</ins><span class="cx">     ResourceHandleInternal* d = priv-&gt;resourceHandle-&gt;getInternal();
</span><span class="cx">     soup_session_pause_message(ResourceHandle::defaultSession(), d-&gt;m_msg);
</span><del>-    
</del><ins>+#endif
+    // Ports not using libsoup need to call the pause/unschedule API of their
+    // underlying network implementation here.
+
</ins><span class="cx">     priv-&gt;paused = TRUE;
</span><span class="cx">     priv-&gt;enoughDataID = 0;
</span><span class="cx">     return FALSE;
</span></span></pre>
</div>
</div>

</body>
</html>