<!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>[176120] trunk/Source/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/176120">176120</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-14 01:21:48 -0800 (Fri, 14 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SOUP] Use GMainLoopSource for request timeout in ResourceHandle
https://bugs.webkit.org/show_bug.cgi?id=138695
Reviewed by Sergio Villar Senin.
We are currently using soup_timeout_add() that simply creates a
GSource and attaches it to the given context. Using
GMainLoopSource we simplify the code and fix any potential problem
of converting the double value into milliseconds.
* platform/network/ResourceHandleInternal.h:
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::cleanupSoupRequestOperation):
(WebCore::ResourceHandle::sendPendingRequest):
(WebCore::ResourceHandle::platformSetDefersLoading):
(WebCore::requestTimeoutCallback): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleInternalh">trunk/Source/WebCore/platform/network/ResourceHandleInternal.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176119 => 176120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-14 08:49:55 UTC (rev 176119)
+++ trunk/Source/WebCore/ChangeLog 2014-11-14 09:21:48 UTC (rev 176120)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-11-14 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] Use GMainLoopSource for request timeout in ResourceHandle
+ https://bugs.webkit.org/show_bug.cgi?id=138695
+
+ Reviewed by Sergio Villar Senin.
+
+ We are currently using soup_timeout_add() that simply creates a
+ GSource and attaches it to the given context. Using
+ GMainLoopSource we simplify the code and fix any potential problem
+ of converting the double value into milliseconds.
+
+ * platform/network/ResourceHandleInternal.h:
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::cleanupSoupRequestOperation):
+ (WebCore::ResourceHandle::sendPendingRequest):
+ (WebCore::ResourceHandle::platformSetDefersLoading):
+ (WebCore::requestTimeoutCallback): Deleted.
+
</ins><span class="cx"> 2014-11-13 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> [mac] Keep around more decoded image data, since it's purgeable
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandleInternal.h (176119 => 176120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2014-11-14 08:49:55 UTC (rev 176119)
+++ trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2014-11-14 09:21:48 UTC (rev 176120)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> #include "GUniquePtrSoup.h"
</span><span class="cx"> #include <libsoup/soup.h>
</span><ins>+#include <wtf/gobject/GMainLoopSource.h>
</ins><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -196,7 +197,7 @@
</span><span class="cx"> GRefPtr<SoupMultipartInputStream> m_multipartInputStream;
</span><span class="cx"> GRefPtr<GCancellable> m_cancellable;
</span><span class="cx"> GRefPtr<GAsyncResult> m_deferredResult;
</span><del>- GRefPtr<GSource> m_timeoutSource;
</del><ins>+ GMainLoopSource m_timeoutSource;
</ins><span class="cx"> GUniquePtr<SoupBuffer> m_soupBuffer;
</span><span class="cx"> unsigned long m_bodySize;
</span><span class="cx"> unsigned long m_bodyDataSent;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (176119 => 176120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-11-14 08:49:55 UTC (rev 176119)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-11-14 09:21:48 UTC (rev 176120)
</span><span class="lines">@@ -231,7 +231,6 @@
</span><span class="cx"> static void cleanupSoupRequestOperation(ResourceHandle*, bool isDestroying = false);
</span><span class="cx"> static void sendRequestCallback(GObject*, GAsyncResult*, gpointer);
</span><span class="cx"> static void readCallback(GObject*, GAsyncResult*, gpointer);
</span><del>-static gboolean requestTimeoutCallback(void*);
</del><span class="cx"> #if ENABLE(WEB_TIMING)
</span><span class="cx"> static int milisecondsSinceRequest(double requestTime);
</span><span class="cx"> #endif
</span><span class="lines">@@ -590,10 +589,7 @@
</span><span class="cx"> d->m_soupMessage.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (d->m_timeoutSource) {
- g_source_destroy(d->m_timeoutSource.get());
- d->m_timeoutSource.clear();
- }
</del><ins>+ d->m_timeoutSource.cancel();
</ins><span class="cx">
</span><span class="cx"> if (!isDestroying)
</span><span class="cx"> handle->deref();
</span><span class="lines">@@ -1015,10 +1011,11 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (d->m_firstRequest.timeoutInterval() > 0) {
</span><del>- // soup_add_timeout returns a GSource* whose only reference is owned by
- // the context. We need to have our own reference to it, hence not using adoptRef.
- d->m_timeoutSource = soup_add_timeout(g_main_context_get_thread_default(),
- d->m_firstRequest.timeoutInterval() * 1000, requestTimeoutCallback, this);
</del><ins>+ d->m_timeoutSource.scheduleAfterDelay("[WebKit] ResourceHandle request timeout", [this] {
+ client()->didFail(this, ResourceError::timeoutError(firstRequest().url().string()));
+ cancel();
+ }, std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::duration<double>(d->m_firstRequest.timeoutInterval())),
+ G_PRIORITY_DEFAULT, nullptr, g_main_context_get_thread_default());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Balanced by a deref() in cleanupSoupRequestOperation, which should always run.
</span><span class="lines">@@ -1223,10 +1220,7 @@
</span><span class="cx">
</span><span class="cx"> // Except when canceling a possible timeout timer, we only need to take action here to UN-defer loading.
</span><span class="cx"> if (defersLoading) {
</span><del>- if (d->m_timeoutSource) {
- g_source_destroy(d->m_timeoutSource.get());
- d->m_timeoutSource.clear();
- }
</del><ins>+ d->m_timeoutSource.cancel();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1345,15 +1339,6 @@
</span><span class="cx"> continueAfterDidReceiveResponse(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static gboolean requestTimeoutCallback(gpointer data)
-{
- RefPtr<ResourceHandle> handle = static_cast<ResourceHandle*>(data);
- handle->client()->didFail(handle.get(), ResourceError::timeoutError(handle->getInternal()->m_firstRequest.url().string()));
- handle->cancel();
-
- return FALSE;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-}
-
</del><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>