<!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>[215268] 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/215268">215268</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2017-04-12 08:52:39 -0700 (Wed, 12 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix WinCairo build after <a href="http://trac.webkit.org/projects/webkit/changeset/215265">r215265</a>
https://bugs.webkit.org/show_bug.cgi?id=170502
m_threadId was removed in the header but not in the constructor implementation.
Initializer lists are our friends.
* platform/network/curl/CurlDownload.cpp:
(WebCore::CurlDownloadManager::CurlDownloadManager):
(WebCore::CurlDownload::CurlDownload): Deleted.
* platform/network/curl/CurlDownload.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlCurlDownloadcpp">trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlCurlDownloadh">trunk/Source/WebCore/platform/network/curl/CurlDownload.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (215267 => 215268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-04-12 12:33:03 UTC (rev 215267)
+++ trunk/Source/WebCore/ChangeLog 2017-04-12 15:52:39 UTC (rev 215268)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-04-12 Alex Christensen <achristensen@webkit.org>
+
+ Fix WinCairo build after r215265
+ https://bugs.webkit.org/show_bug.cgi?id=170502
+
+ m_threadId was removed in the header but not in the constructor implementation.
+ Initializer lists are our friends.
+
+ * platform/network/curl/CurlDownload.cpp:
+ (WebCore::CurlDownloadManager::CurlDownloadManager):
+ (WebCore::CurlDownload::CurlDownload): Deleted.
+ * platform/network/curl/CurlDownload.h:
+
</ins><span class="cx"> 2017-04-12 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, build fix for Win and GTK
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCurlDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp (215267 => 215268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp 2017-04-12 12:33:03 UTC (rev 215267)
+++ trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp 2017-04-12 15:52:39 UTC (rev 215268)
</span><span class="lines">@@ -43,9 +43,6 @@
</span><span class="cx"> // CurlDownloadManager -------------------------------------------------------------------
</span><span class="cx">
</span><span class="cx"> CurlDownloadManager::CurlDownloadManager()
</span><del>-: m_threadId(0)
-, m_curlMultiHandle(0)
-, m_runThread(false)
</del><span class="cx"> {
</span><span class="cx"> curl_global_init(CURL_GLOBAL_ALL);
</span><span class="cx"> m_curlMultiHandle = curl_multi_init();
</span><span class="lines">@@ -233,15 +230,7 @@
</span><span class="cx">
</span><span class="cx"> CurlDownloadManager CurlDownload::m_downloadManager;
</span><span class="cx">
</span><del>-CurlDownload::CurlDownload()
- : m_curlHandle(nullptr)
- , m_customHeaders(nullptr)
- , m_url(nullptr)
- , m_tempHandle(invalidPlatformFileHandle)
- , m_deletesFileUponFailure(false)
- , m_listener(nullptr)
-{
-}
</del><ins>+CurlDownload::CurlDownload() = default;
</ins><span class="cx">
</span><span class="cx"> CurlDownload::~CurlDownload()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCurlDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CurlDownload.h (215267 => 215268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CurlDownload.h 2017-04-12 12:33:03 UTC (rev 215267)
+++ trunk/Source/WebCore/platform/network/curl/CurlDownload.h 2017-04-12 15:52:39 UTC (rev 215268)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef CurlDownload_h
-#define CurlDownload_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "FileSystem.h"
</span><span class="cx"> #include "ResourceHandle.h"
</span><span class="lines">@@ -70,12 +69,12 @@
</span><span class="cx"> static void downloadThread(void* data);
</span><span class="cx">
</span><span class="cx"> RefPtr<Thread> m_thread;
</span><del>- CURLM* m_curlMultiHandle;
</del><ins>+ CURLM* m_curlMultiHandle { nullptr };
</ins><span class="cx"> Vector<CURL*> m_pendingHandleList;
</span><span class="cx"> Vector<CURL*> m_activeHandleList;
</span><span class="cx"> Vector<CURL*> m_removedHandleList;
</span><span class="cx"> mutable Lock m_mutex;
</span><del>- bool m_runThread;
</del><ins>+ bool m_runThread { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class CurlDownloadListener {
</span><span class="lines">@@ -133,16 +132,16 @@
</span><span class="cx"> static void receivedDataCallback(CurlDownload*, int size);
</span><span class="cx"> static void receivedResponseCallback(CurlDownload*);
</span><span class="cx">
</span><del>- CURL* m_curlHandle;
- struct curl_slist* m_customHeaders;
- char* m_url;
</del><ins>+ CURL* m_curlHandle { nullptr };
+ struct curl_slist* m_customHeaders { nullptr };
+ char* m_url { nullptr };
</ins><span class="cx"> String m_tempPath;
</span><span class="cx"> String m_destination;
</span><del>- WebCore::PlatformFileHandle m_tempHandle;
</del><ins>+ WebCore::PlatformFileHandle m_tempHandle { invalidPlatformFileHandle };
</ins><span class="cx"> WebCore::ResourceResponse m_response;
</span><del>- bool m_deletesFileUponFailure;
</del><ins>+ bool m_deletesFileUponFailure { false };
</ins><span class="cx"> mutable Lock m_mutex;
</span><del>- CurlDownloadListener *m_listener;
</del><ins>+ CurlDownloadListener* m_listener { nullptr };
</ins><span class="cx">
</span><span class="cx"> static CurlDownloadManager m_downloadManager;
</span><span class="cx">
</span><span class="lines">@@ -150,5 +149,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre>
</div>
</div>
</body>
</html>