<!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>[46468] 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/46468">46468</a></dd>
<dt>Author</dt> <dd>jmalonzo@webkit.org</dd>
<dt>Date</dt> <dd>2009-07-28 04:02:41 -0700 (Tue, 28 Jul 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-07-28  Jan Michael Alonzo  &lt;jmalonzo@webkit.org&gt;

        Reviewed by Xan Lopez.

        [Gtk] Refactor ResourceHandleSoup - make start* functions static
        https://bugs.webkit.org/show_bug.cgi?id=27687

        * platform/network/ResourceHandle.h:
        * platform/network/soup/ResourceHandleSoup.cpp:
        (WebCore::startData):
        (WebCore::startHttp):
        (WebCore::):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformnetworkResourceHandleh">trunk/WebCore/platform/network/ResourceHandle.h</a></li>
<li><a href="#trunkWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (46467 => 46468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-07-28 10:58:33 UTC (rev 46467)
+++ trunk/WebCore/ChangeLog        2009-07-28 11:02:41 UTC (rev 46468)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2009-07-28  Jan Michael Alonzo  &lt;jmalonzo@webkit.org&gt;
+
+        Reviewed by Xan Lopez.
+
+        [Gtk] Refactor ResourceHandleSoup - make start* functions static
+        https://bugs.webkit.org/show_bug.cgi?id=27687
+
+        * platform/network/ResourceHandle.h:
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::startData):
+        (WebCore::startHttp):
+        (WebCore::):
+
</ins><span class="cx"> 2009-07-28  Xan Lopez  &lt;xlopez@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Gustavo Noronha.
</span></span></pre></div>
<a id="trunkWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/network/ResourceHandle.h (46467 => 46468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/network/ResourceHandle.h        2009-07-28 10:58:33 UTC (rev 46467)
+++ trunk/WebCore/platform/network/ResourceHandle.h        2009-07-28 11:02:41 UTC (rev 46468)
</span><span class="lines">@@ -191,12 +191,6 @@
</span><span class="cx">     void fireFailure(Timer&lt;ResourceHandle&gt;*);
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-#if USE(SOUP)
-    bool startData(String urlString);
-    bool startHttp(String urlString);
-    bool startGio(KURL url);
-#endif
-
</del><span class="cx">     void scheduleFailure(FailureType);
</span><span class="cx"> 
</span><span class="cx">     bool start(Frame*);
</span></span></pre></div>
<a id="trunkWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp (46467 => 46468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp        2009-07-28 10:58:33 UTC (rev 46467)
+++ trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp        2009-07-28 11:02:41 UTC (rev 46468)
</span><span class="lines">@@ -118,6 +118,8 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static void cleanupGioOperation(ResourceHandleInternal* handle);
</span><ins>+static bool startData(ResourceHandle* handle, String urlString);
+static bool startGio(ResourceHandle* handle, KURL url);
</ins><span class="cx"> 
</span><span class="cx"> ResourceHandleInternal::~ResourceHandleInternal()
</span><span class="cx"> {
</span><span class="lines">@@ -420,13 +422,15 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool ResourceHandle::startData(String urlString)
</del><ins>+static bool startData(ResourceHandle* handle, String urlString)
</ins><span class="cx"> {
</span><del>-    ResourceHandleInternal* d = this-&gt;getInternal();
</del><ins>+    ASSERT(handle);
</ins><span class="cx"> 
</span><ins>+    ResourceHandleInternal* d = handle-&gt;getInternal();
+
</ins><span class="cx">     // If parseDataUrl is called synchronously the job is not yet effectively started
</span><span class="cx">     // and webkit won't never know that the data has been parsed even didFinishLoading is called.
</span><del>-    d-&gt;m_idleHandler = g_idle_add(parseDataUrl, this);
</del><ins>+    d-&gt;m_idleHandler = g_idle_add(parseDataUrl, handle);
</ins><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -455,19 +459,23 @@
</span><span class="cx">     g_object_set_data(G_OBJECT(session), &quot;webkit-init&quot;, reinterpret_cast&lt;void*&gt;(0xdeadbeef));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool ResourceHandle::startHttp(String urlString)
</del><ins>+static bool startHttp(ResourceHandle* handle, String urlString)
</ins><span class="cx"> {
</span><del>-    SoupSession* session = defaultSession();
</del><ins>+    ASSERT(handle);

+    SoupSession* session = handle-&gt;defaultSession();
</ins><span class="cx">     ensureSessionIsInitialized(session);
</span><span class="cx"> 
</span><del>-    d-&gt;m_msg = request().toSoupMessage();
-    g_signal_connect(d-&gt;m_msg, &quot;restarted&quot;, G_CALLBACK(restartedCallback), this);
-    g_signal_connect(d-&gt;m_msg, &quot;got-headers&quot;, G_CALLBACK(gotHeadersCallback), this);
-    g_signal_connect(d-&gt;m_msg, &quot;content-sniffed&quot;, G_CALLBACK(contentSniffedCallback), this);
-    g_signal_connect(d-&gt;m_msg, &quot;got-chunk&quot;, G_CALLBACK(gotChunkCallback), this);
</del><ins>+    ResourceHandleInternal* d = handle-&gt;getInternal();
</ins><span class="cx"> 
</span><del>-    g_object_set_data(G_OBJECT(d-&gt;m_msg), &quot;resourceHandle&quot;, reinterpret_cast&lt;void*&gt;(this));
</del><ins>+    d-&gt;m_msg = handle-&gt;request().toSoupMessage();
+    g_signal_connect(d-&gt;m_msg, &quot;restarted&quot;, G_CALLBACK(restartedCallback), handle);
+    g_signal_connect(d-&gt;m_msg, &quot;got-headers&quot;, G_CALLBACK(gotHeadersCallback), handle);
+    g_signal_connect(d-&gt;m_msg, &quot;content-sniffed&quot;, G_CALLBACK(contentSniffedCallback), handle);
+    g_signal_connect(d-&gt;m_msg, &quot;got-chunk&quot;, G_CALLBACK(gotChunkCallback), handle);
</ins><span class="cx"> 
</span><ins>+    g_object_set_data(G_OBJECT(d-&gt;m_msg), &quot;resourceHandle&quot;, reinterpret_cast&lt;void*&gt;(handle));
+
</ins><span class="cx">     FormData* httpBody = d-&gt;m_request.httpBody();
</span><span class="cx">     if (httpBody &amp;&amp; !httpBody-&gt;isEmpty()) {
</span><span class="cx">         size_t numElements = httpBody-&gt;elements().size();
</span><span class="lines">@@ -509,10 +517,10 @@
</span><span class="cx">                                                     String::fromUTF8(error-&gt;message));
</span><span class="cx">                         g_error_free(error);
</span><span class="cx"> 
</span><del>-                        d-&gt;client()-&gt;didFail(this, resourceError);
</del><ins>+                        d-&gt;client()-&gt;didFail(handle, resourceError);
</ins><span class="cx"> 
</span><span class="cx">                         g_signal_handlers_disconnect_matched(d-&gt;m_msg, G_SIGNAL_MATCH_DATA,
</span><del>-                                                             0, 0, 0, 0, this);
</del><ins>+                                                             0, 0, 0, 0, handle);
</ins><span class="cx">                         g_object_unref(d-&gt;m_msg);
</span><span class="cx">                         d-&gt;m_msg = 0;
</span><span class="cx"> 
</span><span class="lines">@@ -535,7 +543,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // balanced by a deref() in finishedCallback, which should always run
</span><del>-    ref();
</del><ins>+    handle-&gt;ref();
</ins><span class="cx"> 
</span><span class="cx">     // FIXME: For now, we cannot accept content encoded in anything
</span><span class="cx">     // other than identity, so force servers to do it our way. When
</span><span class="lines">@@ -547,7 +555,7 @@
</span><span class="cx">     // keep our own ref, because after queueing the message, the
</span><span class="cx">     // session owns the initial reference.
</span><span class="cx">     g_object_ref(d-&gt;m_msg);
</span><del>-    soup_session_queue_message(session, d-&gt;m_msg, finishedCallback, this);
</del><ins>+    soup_session_queue_message(session, d-&gt;m_msg, finishedCallback, handle);
</ins><span class="cx"> 
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="lines">@@ -572,18 +580,18 @@
</span><span class="cx">     d-&gt;m_frame = frame;
</span><span class="cx"> 
</span><span class="cx">     if (equalIgnoringCase(protocol, &quot;data&quot;))
</span><del>-        return startData(urlString);
</del><ins>+        return startData(this, urlString);
</ins><span class="cx"> 
</span><span class="cx">     SoupURI* uri = soup_uri_new(urlString.utf8().data());
</span><span class="cx">     bool isHTTPOrHTTPS = (equalIgnoringCase(protocol, &quot;http&quot;) || equalIgnoringCase(protocol, &quot;https&quot;)) &amp;&amp; SOUP_URI_VALID_FOR_HTTP(uri);
</span><span class="cx">     soup_uri_free(uri);
</span><span class="cx"> 
</span><span class="cx">     if (isHTTPOrHTTPS)
</span><del>-        return startHttp(urlString);
</del><ins>+        return startHttp(this, urlString);
</ins><span class="cx"> 
</span><span class="cx">     if (equalIgnoringCase(protocol, &quot;file&quot;) || equalIgnoringCase(protocol, &quot;ftp&quot;) || equalIgnoringCase(protocol, &quot;ftps&quot;))
</span><span class="cx">         // FIXME: should we be doing any other protocols here?
</span><del>-        return startGio(url);
</del><ins>+        return startGio(this, url);
</ins><span class="cx"> 
</span><span class="cx">     // Error must not be reported immediately
</span><span class="cx">     this-&gt;scheduleFailure(InvalidURLFailure);
</span><span class="lines">@@ -830,14 +838,17 @@
</span><span class="cx">     g_file_read_async(d-&gt;m_gfile, G_PRIORITY_DEFAULT, d-&gt;m_cancellable,
</span><span class="cx">                       openCallback, 0);
</span><span class="cx"> }
</span><ins>+static bool startGio(ResourceHandle* handle, KURL url)
+{
+    ASSERT(handle);
</ins><span class="cx"> 
</span><del>-bool ResourceHandle::startGio(KURL url)
-{
-    if (request().httpMethod() != &quot;GET&quot; &amp;&amp; request().httpMethod() != &quot;POST&quot;) {
</del><ins>+    ResourceHandleInternal* d = handle-&gt;getInternal();
+
+    if (handle-&gt;request().httpMethod() != &quot;GET&quot; &amp;&amp; handle-&gt;request().httpMethod() != &quot;POST&quot;) {
</ins><span class="cx">         ResourceError error(g_quark_to_string(SOUP_HTTP_ERROR),
</span><span class="cx">                             SOUP_STATUS_METHOD_NOT_ALLOWED,
</span><del>-                            url.string(), request().httpMethod());
-        d-&gt;client()-&gt;didFail(this, error);
</del><ins>+                            url.string(), handle-&gt;request().httpMethod());
+        d-&gt;client()-&gt;didFail(handle, error);
</ins><span class="cx">         return false;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -857,7 +868,7 @@
</span><span class="cx">     else
</span><span class="cx"> #endif
</span><span class="cx">         d-&gt;m_gfile = g_file_new_for_uri(url.string().utf8().data());
</span><del>-    g_object_set_data(G_OBJECT(d-&gt;m_gfile), &quot;webkit-resource&quot;, this);
</del><ins>+    g_object_set_data(G_OBJECT(d-&gt;m_gfile), &quot;webkit-resource&quot;, handle);
</ins><span class="cx">     d-&gt;m_cancellable = g_cancellable_new();
</span><span class="cx">     g_file_query_info_async(d-&gt;m_gfile,
</span><span class="cx">                             G_FILE_ATTRIBUTE_STANDARD_TYPE &quot;,&quot;
</span></span></pre>
</div>
</div>

</body>
</html>