Diff
Modified: trunk/Source/WebKit/ChangeLog (228566 => 228567)
--- trunk/Source/WebKit/ChangeLog 2018-02-16 19:25:18 UTC (rev 228566)
+++ trunk/Source/WebKit/ChangeLog 2018-02-16 19:34:12 UTC (rev 228567)
@@ -1,3 +1,14 @@
+2018-02-16 Yousuke Kimoto <[email protected]>
+
+ [WinCario] Add NetworkSessionCurl
+ https://bugs.webkit.org/show_bug.cgi?id=182680
+
+ Reviewed by Konstantin Tokarev.
+
+ * NetworkProcess/NetworkSession.cpp:
+ (WebKit::NetworkSession::create):
+ * PlatformWin.cmake:
+
2018-02-16 Chris Dumez <[email protected]>
ASSERTION FAILED: !m_processes[i] || *m_processes[i] == process in MessagePortChannel::entanglePortWithProcess()
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp (228566 => 228567)
--- trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp 2018-02-16 19:25:18 UTC (rev 228566)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp 2018-02-16 19:34:12 UTC (rev 228567)
@@ -37,6 +37,9 @@
#if USE(SOUP)
#include "NetworkSessionSoup.h"
#endif
+#if USE(CURL)
+#include "NetworkSessionCurl.h"
+#endif
using namespace WebCore;
@@ -51,6 +54,9 @@
#if USE(SOUP)
return NetworkSessionSoup::create(WTFMove(parameters));
#endif
+#if USE(CURL)
+ return NetworkSessionCurl::create(WTFMove(parameters));
+#endif
}
NetworkStorageSession& NetworkSession::networkStorageSession() const
Copied: trunk/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp (from rev 228566, trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp) (0 => 228567)
--- trunk/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp (rev 0)
+++ trunk/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.cpp 2018-02-16 19:34:12 UTC (rev 228567)
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2018 Sony Interactive Entertainment Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "NetworkSessionCurl.h"
+
+#include "NetworkSessionCreationParameters.h"
+
+using namespace WebCore;
+
+namespace WebKit {
+
+NetworkSessionCurl::NetworkSessionCurl(NetworkSessionCreationParameters&& parameters)
+ : NetworkSession(parameters.sessionID)
+{
+
+}
+
+NetworkSessionCurl::~NetworkSessionCurl()
+{
+
+}
+
+} // namespace WebKit
Copied: trunk/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.h (from rev 228566, trunk/Source/WebKit/NetworkProcess/NetworkSession.cpp) (0 => 228567)
--- trunk/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.h (rev 0)
+++ trunk/Source/WebKit/NetworkProcess/curl/NetworkSessionCurl.h 2018-02-16 19:34:12 UTC (rev 228567)
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2018 Sony Interactive Entertainment Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "NetworkSession.h"
+
+namespace WebKit {
+
+struct NetworkSessionCreationParameters;
+
+class NetworkSessionCurl final : public NetworkSession {
+public:
+ static Ref<NetworkSession> create(NetworkSessionCreationParameters&& parameters)
+ {
+ return adoptRef(*new NetworkSessionCurl(WTFMove(parameters)));
+ }
+ ~NetworkSessionCurl();
+
+private:
+ NetworkSessionCurl(NetworkSessionCreationParameters&&);
+};
+
+} // namespace WebKit
Modified: trunk/Source/WebKit/PlatformWin.cmake (228566 => 228567)
--- trunk/Source/WebKit/PlatformWin.cmake 2018-02-16 19:25:18 UTC (rev 228566)
+++ trunk/Source/WebKit/PlatformWin.cmake 2018-02-16 19:34:12 UTC (rev 228567)
@@ -124,7 +124,8 @@
)
list(APPEND WebKit_INCLUDE_DIRECTORIES
- "${WEBKIT_DIR}/UIProcess/WebCoreSupport/curl"
+ "${WEBKIT_DIR}/NetworkProcess/curl"
+ "${WEBKIT_DIR}/WebProcess/WebCoreSupport/curl"
)
list(APPEND WebKit_LIBRARIES
