[webkit-changes] [240404] trunk/Source

Wed, 23 Jan 2019 20:31:53 -0800

Title: [240404] trunk/Source
Revision
240404
Author
commit-qu...@webkit.org
Date
2019-01-23 20:31:37 -0800 (Wed, 23 Jan 2019)

Log Message

Unreviewed, rolling out r240403.
https://bugs.webkit.org/show_bug.cgi?id=193757

"Causes multiple crashes on macOS port (probably used wrong
ENABLE macro)" (Requested by ddkilzer on #webkit).

Reverted changeset:

"[Curl] Unreviewed build fix for r240292 and friends."
https://trac.webkit.org/changeset/240403

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (240403 => 240404)


--- trunk/Source/WebKit/ChangeLog	2019-01-24 02:50:13 UTC (rev 240403)
+++ trunk/Source/WebKit/ChangeLog	2019-01-24 04:31:37 UTC (rev 240404)
@@ -1,3 +1,16 @@
+2019-01-23  Commit Queue  <commit-qu...@webkit.org>
+
+        Unreviewed, rolling out r240403.
+        https://bugs.webkit.org/show_bug.cgi?id=193757
+
+        "Causes multiple crashes on macOS port (probably used wrong
+        ENABLE macro)" (Requested by ddkilzer on #webkit).
+
+        Reverted changeset:
+
+        "[Curl] Unreviewed build fix for r240292 and friends."
+        https://trac.webkit.org/changeset/240403
+
 2019-01-23  Ross Kirsling  <ross.kirsl...@sony.com>
 
         [Curl] Unreviewed build fix for r240292 and friends.

Modified: trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp (240403 => 240404)


--- trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp	2019-01-24 02:50:13 UTC (rev 240403)
+++ trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp	2019-01-24 04:31:37 UTC (rev 240404)
@@ -41,7 +41,7 @@
 
 std::unique_ptr<WebCore::NetworkStorageSession> NetworkProcess::platformCreateDefaultStorageSession() const
 {
-    return std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID(), nullptr);
+    return std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID(), CurlContext::singleton());
 }
 
 void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo& certificateInfo, const String& host)
@@ -88,7 +88,7 @@
 
 void NetworkProcess::setNetworkProxySettings(PAL::SessionID sessionID, WebCore::CurlProxySettings&& settings)
 {
-    if (auto* networkStorageSession = storageSession(sessionID))
+    if (auto* networkStorageSession = NetworkStorageSession::storageSession(sessionID))
         networkStorageSession->setProxySettings(WTFMove(settings));
     else
         ASSERT_NOT_REACHED();

Modified: trunk/Source/WebKitLegacy/ChangeLog (240403 => 240404)


--- trunk/Source/WebKitLegacy/ChangeLog	2019-01-24 02:50:13 UTC (rev 240403)
+++ trunk/Source/WebKitLegacy/ChangeLog	2019-01-24 04:31:37 UTC (rev 240404)
@@ -1,3 +1,16 @@
+2019-01-23  Commit Queue  <commit-qu...@webkit.org>
+
+        Unreviewed, rolling out r240403.
+        https://bugs.webkit.org/show_bug.cgi?id=193757
+
+        "Causes multiple crashes on macOS port (probably used wrong
+        ENABLE macro)" (Requested by ddkilzer on #webkit).
+
+        Reverted changeset:
+
+        "[Curl] Unreviewed build fix for r240292 and friends."
+        https://trac.webkit.org/changeset/240403
+
 2019-01-23  Ross Kirsling  <ross.kirsl...@sony.com>
 
         [Curl] Unreviewed build fix for r240292 and friends.

Modified: trunk/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp (240403 => 240404)


--- trunk/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp	2019-01-24 02:50:13 UTC (rev 240403)
+++ trunk/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp	2019-01-24 04:31:37 UTC (rev 240404)
@@ -53,19 +53,13 @@
 
 WebCore::NetworkStorageSession& NetworkStorageSessionMap::defaultStorageSession()
 {
-    if (!defaultNetworkStorageSession()) {
-#if USE(CURL)
-        defaultNetworkStorageSession() = std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID(), nullptr);
-#else
+    if (!defaultNetworkStorageSession())
         defaultNetworkStorageSession() = std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID());
-#endif
-    }
     return *defaultNetworkStorageSession();
 }
 
 void NetworkStorageSessionMap::switchToNewTestingSession()
 {
-#if USE(CFURLCONNECTION)
     // Session name should be short enough for shared memory region name to be under the limit, otehrwise sandbox rules won't work (see <rdar://problem/13642852>).
     String sessionName = String::format("WebKit Test-%u", static_cast<uint32_t>(getCurrentProcessID()));
 
@@ -79,12 +73,10 @@
     }
 
     defaultNetworkStorageSession() = std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID(), WTFMove(session), WTFMove(cookieStorage));
-#endif
 }
 
 void NetworkStorageSessionMap::ensureSession(const PAL::SessionID& sessionID, const String& identifierBase)
 {
-#if USE(CFURLCONNECTION)
     auto addResult = globalSessionMap().add(sessionID, nullptr);
     if (!addResult.isNewEntry)
         return;
@@ -105,7 +97,6 @@
     }
 
     addResult.iterator->value = std::make_unique<WebCore::NetworkStorageSession>(sessionID, WTFMove(storageSession), WTFMove(cookieStorage));
-#endif
 }
 
 void NetworkStorageSessionMap::destroySession(const PAL::SessionID& sessionID)

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to