Title: [215268] trunk/Source/WebCore
- Revision
- 215268
- Author
- [email protected]
- Date
- 2017-04-12 08:52:39 -0700 (Wed, 12 Apr 2017)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (215267 => 215268)
--- 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)
@@ -1,3 +1,16 @@
+2017-04-12 Alex Christensen <[email protected]>
+
+ 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:
+
2017-04-12 Yusuke Suzuki <[email protected]>
Unreviewed, build fix for Win and GTK
Modified: trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp (215267 => 215268)
--- 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)
@@ -43,9 +43,6 @@
// CurlDownloadManager -------------------------------------------------------------------
CurlDownloadManager::CurlDownloadManager()
-: m_threadId(0)
-, m_curlMultiHandle(0)
-, m_runThread(false)
{
curl_global_init(CURL_GLOBAL_ALL);
m_curlMultiHandle = curl_multi_init();
@@ -233,15 +230,7 @@
CurlDownloadManager CurlDownload::m_downloadManager;
-CurlDownload::CurlDownload()
- : m_curlHandle(nullptr)
- , m_customHeaders(nullptr)
- , m_url(nullptr)
- , m_tempHandle(invalidPlatformFileHandle)
- , m_deletesFileUponFailure(false)
- , m_listener(nullptr)
-{
-}
+CurlDownload::CurlDownload() = default;
CurlDownload::~CurlDownload()
{
Modified: trunk/Source/WebCore/platform/network/curl/CurlDownload.h (215267 => 215268)
--- 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)
@@ -23,8 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef CurlDownload_h
-#define CurlDownload_h
+#pragma once
#include "FileSystem.h"
#include "ResourceHandle.h"
@@ -70,12 +69,12 @@
static void downloadThread(void* data);
RefPtr<Thread> m_thread;
- CURLM* m_curlMultiHandle;
+ CURLM* m_curlMultiHandle { nullptr };
Vector<CURL*> m_pendingHandleList;
Vector<CURL*> m_activeHandleList;
Vector<CURL*> m_removedHandleList;
mutable Lock m_mutex;
- bool m_runThread;
+ bool m_runThread { false };
};
class CurlDownloadListener {
@@ -133,16 +132,16 @@
static void receivedDataCallback(CurlDownload*, int size);
static void receivedResponseCallback(CurlDownload*);
- CURL* m_curlHandle;
- struct curl_slist* m_customHeaders;
- char* m_url;
+ CURL* m_curlHandle { nullptr };
+ struct curl_slist* m_customHeaders { nullptr };
+ char* m_url { nullptr };
String m_tempPath;
String m_destination;
- WebCore::PlatformFileHandle m_tempHandle;
+ WebCore::PlatformFileHandle m_tempHandle { invalidPlatformFileHandle };
WebCore::ResourceResponse m_response;
- bool m_deletesFileUponFailure;
+ bool m_deletesFileUponFailure { false };
mutable Lock m_mutex;
- CurlDownloadListener *m_listener;
+ CurlDownloadListener* m_listener { nullptr };
static CurlDownloadManager m_downloadManager;
@@ -150,5 +149,3 @@
};
}
-
-#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
