Attachment 360574 Details for Bug 193816 – Patch

[patch] Patch

bug-193816-20190130230041.patch (text/plain), 3.29 KB, created by Takashi Komori on 2019-01-30 06:03:27 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Takashi Komori

Created: 2019-01-30 06:03:27 PST

Size: 3.29 KB

patch

obsolete

>Subversion Revision: 240687
>diff --git a/Source/WebKitLegacy/ChangeLog b/Source/WebKitLegacy/ChangeLog
>index d9590d8d0e60c982957d51e287a41129c7d078a6..507a8bc1fa4196bee611a240955c554c749d0ab2 100644
>--- a/Source/WebKitLegacy/ChangeLog
>+++ b/Source/WebKitLegacy/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-01-30  Takashi Komori  <Takashi.Komori@sony.com>
>+
>+        [Curl] Fix DRT crash related to private browsing.
>+        https://bugs.webkit.org/show_bug.cgi?id=193816
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebCoreSupport/NetworkStorageSessionMap.cpp:
>+        (NetworkStorageSessionMap::ensureSession):
>+
> 2019-01-26  Darin Adler  <darin@apple.com>
>   
>         Replace many uses of String::format with more type-safe alternatives
>diff --git a/Source/WebKitLegacy/win/ChangeLog b/Source/WebKitLegacy/win/ChangeLog
>index bdc4fe171e4b70cb4345f5d38cb8a532aad44e9f..e0f071a3e3c9ceacebb8383dce09279f72d51ac4 100644
>--- a/Source/WebKitLegacy/win/ChangeLog
>+++ b/Source/WebKitLegacy/win/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-01-30  Takashi Komori  <Takashi.Komori@sony.com>
>+
>+        [Curl] Fix DRT crash related to private browsing.
>+        https://bugs.webkit.org/show_bug.cgi?id=193816
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebCoreSupport/WebFrameNetworkingContext.cpp:
>+        (WebFrameNetworkingContext::ensurePrivateBrowsingSession):
>+
> 2019-01-28  Ross Kirsling  <ross.kirsling@sony.com>
> 
>         Remove unnecessary `using namespace WTF`s (or at least restrict their scope).
>diff --git a/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp b/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp
>index 584f0a163c8c3a513bf735439f7134112ba3f98f..d4de0815ada4d41fc008a6f1363941ba70a4e415 100644
>--- a/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp
>+++ b/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp
>@@ -106,6 +106,13 @@ void NetworkStorageSessionMap::ensureSession(const PAL::SessionID& sessionID, co
>     }
> 
>     addResult.iterator->value = std::make_unique<WebCore::NetworkStorageSession>(sessionID, WTFMove(storageSession), WTFMove(cookieStorage));
>+
>+#elif USE(CURL)
>+    auto addResult = globalSessionMap().add(sessionID, nullptr);
>+    if (!addResult.isNewEntry)
>+        return;
>+
>+    addResult.iterator->value = std::make_unique<WebCore::NetworkStorageSession>(sessionID, nullptr);
> #endif
> }
> 
>diff --git a/Source/WebKitLegacy/win/WebCoreSupport/WebFrameNetworkingContext.cpp b/Source/WebKitLegacy/win/WebCoreSupport/WebFrameNetworkingContext.cpp
>index f134f3cc9863e2dfb211eb895ab331a9e35f4e56..8507e0998ccaeced62f8cf9eb49e1fd41fc12b88 100644
>--- a/Source/WebKitLegacy/win/WebCoreSupport/WebFrameNetworkingContext.cpp
>+++ b/Source/WebKitLegacy/win/WebCoreSupport/WebFrameNetworkingContext.cpp
>@@ -84,6 +84,14 @@ NetworkStorageSession& WebFrameNetworkingContext::ensurePrivateBrowsingSession()
> 
>     NetworkStorageSessionMap::ensureSession(PAL::SessionID::legacyPrivateSessionID(), base);
> 
>+#elif USE(CURL)
>+    ASSERT(isMainThread());
>+
>+    if (auto privateSession = NetworkStorageSessionMap::storageSession(PAL::SessionID::legacyPrivateSessionID()))
>+        return *privateSession;
>+
>+    NetworkStorageSessionMap::ensureSession(PAL::SessionID::legacyPrivateSessionID());
>+
> #endif
>     return *NetworkStorageSessionMap::storageSession(PAL::SessionID::legacyPrivateSessionID());
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 193816: 360574 | 360700