Changeset 240304 in webkit

Timestamp:

Jan 22, 2019 4:10:19 PM (5 years ago)

Author:

Michael Catanzaro

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):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-01-22  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        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):
+
 2019-01-22  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

@@ -97 +97 @@
 #endif
 
+#if USE(CURL)
+#include <WebCore/CurlContext.h>
+#endif
+
 #if ENABLE(SERVICE_WORKER)
 #include "WebSWServerToContextConnectionMessages.h"
@@ -530 +534 @@
 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;
 }