Attachment 359990 Details for Bug 193757 – ROLLOUT of r240403

[patch] ROLLOUT of r240403

bug-193757-20190123202847.patch (text/plain), 5.12 KB, created by WebKit Commit Bot on 2019-01-23 20:28:47 PST

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2019-01-23 20:28:47 PST

Size: 5.12 KB

patch

obsolete

>Subversion Revision: 240403
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 6c1b6f6b4fbaf7dd73c7c594046719ac8f21dd2e..c7bb0d21ca93ee5a4fa920a0ee06bbdb590f131c 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-01-23  Commit Queue  <commit-queue@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.kirsling@sony.com>
> 
>         [Curl] Unreviewed build fix for r240292 and friends.
>diff --git a/Source/WebKitLegacy/ChangeLog b/Source/WebKitLegacy/ChangeLog
>index c8e6dd9785c72e8a74ef786f2779329c4432bb80..0e8e8603e95e4472db77a91c3c52ecb5b6e0ee8d 100644
>--- a/Source/WebKitLegacy/ChangeLog
>+++ b/Source/WebKitLegacy/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-01-23  Commit Queue  <commit-queue@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.kirsling@sony.com>
> 
>         [Curl] Unreviewed build fix for r240292 and friends.
>diff --git a/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp
>index 91ffa49b37a2bb505e599a6ecc1ffdf984c0ef58..fd5d6e5ed5fe96106aac9f93303f271abae7ce84 100644
>--- a/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp
>+++ b/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp
>@@ -41,7 +41,7 @@ void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreati
> 
> 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::platformProcessDidTransitionToBackground()
> 
> 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();
>diff --git a/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp b/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp
>index fdb1b2411e97c2e010a2e837131e2fc1940554a7..4eca34d5842b0cf1a01af2a5151c1991804c43d8 100644
>--- a/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp
>+++ b/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp
>@@ -53,19 +53,13 @@ WebCore::NetworkStorageSession* NetworkStorageSessionMap::storageSession(const P
> 
> 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 @@ void NetworkStorageSessionMap::switchToNewTestingSession()
>     }
> 
>     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 @@ void NetworkStorageSessionMap::ensureSession(const PAL::SessionID& sessionID, co
>     }
> 
>     addResult.iterator->value = std::make_unique<WebCore::NetworkStorageSession>(sessionID, WTFMove(storageSession), WTFMove(cookieStorage));
>-#endif
> }
> 
> void NetworkStorageSessionMap::destroySession(const PAL::SessionID& sessionID)

Actions: View | Formatted Diff | Diff

Attachments on bug 193757: 359990