Title: [240304] trunk/Source/WebKit
- Revision
- 240304
- Author
- mcatanz...@igalia.com
- Date
- 2019-01-22 16:10:19 -0800 (Tue, 22 Jan 2019)
Log Message
Unreviewed, further build fixes after r240292
https://bugs.webkit.org/show_bug.cgi?id=193580
<rdar://problem/47457742>
This builds for libsoup. Doesn't work, but at least builds.
Also, speculative fixes for curl.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::defaultStorageSession const):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (240303 => 240304)
--- trunk/Source/WebKit/ChangeLog 2019-01-23 00:04:23 UTC (rev 240303)
+++ trunk/Source/WebKit/ChangeLog 2019-01-23 00:10:19 UTC (rev 240304)
@@ -4,6 +4,19 @@
https://bugs.webkit.org/show_bug.cgi?id=193580
<rdar://problem/47457742>
+ This builds for libsoup. Doesn't work, but at least builds.
+
+ Also, speculative fixes for curl.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::defaultStorageSession const):
+
+2019-01-22 Michael Catanzaro <mcatanz...@igalia.com>
+
+ Unreviewed, further build fixes after r240292
+ https://bugs.webkit.org/show_bug.cgi?id=193580
+ <rdar://problem/47457742>
+
Still not working yet.
* NetworkProcess/NetworkProcess.cpp:
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (240303 => 240304)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-01-23 00:04:23 UTC (rev 240303)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-01-23 00:10:19 UTC (rev 240304)
@@ -96,6 +96,10 @@
#include <WebCore/SoupNetworkSession.h>
#endif
+#if USE(CURL)
+#include <WebCore/CurlContext.h>
+#endif
+
#if ENABLE(SERVICE_WORKER)
#include "WebSWServerToContextConnectionMessages.h"
#endif
@@ -529,8 +533,19 @@
WebCore::NetworkStorageSession& NetworkProcess::defaultStorageSession() const
{
- if (!m_defaultNetworkStorageSession)
- m_defaultNetworkStorageSession = std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID());
+ if (m_defaultNetworkStorageSession)
+ return *m_defaultNetworkStorageSession;
+
+#if PLATFORM(COCOA)
+ m_defaultNetworkStorageSession = std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID());
+#elif PLATFORM(SOUP)
+ m_defaultNetworkStorageSession = std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID(), std::make_unique<SoupNetworkSession>(PAL::SessionID::defaultSessionID()));
+#elif PLATFORM(CURL)
+ m_defaultNetworkStorageSession = std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID(), CurlContext::singleton());
+#else
+#error Implement me
+#endif
+
return *m_defaultNetworkStorageSession;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
