Changeset 240791 in webkit

Timestamp:

Jan 31, 2019 9:04:34 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[Curl] Fix DRT crash related to private browsing.
​https://bugs.webkit.org/show_bug.cgi?id=193816

Patch by Takashi Komori <​Takashi.Komori@sony.com> on 2019-01-31
Reviewed by Alex Christensen.

Source/WebKitLegacy:

• WebCoreSupport/NetworkStorageSessionMap.cpp:

(NetworkStorageSessionMap::ensureSession):

Source/WebKitLegacy/win:

• WebCoreSupport/WebFrameNetworkingContext.cpp:

(WebFrameNetworkingContext::ensurePrivateBrowsingSession):

Location:

trunk/Source/WebKitLegacy

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/NetworkStorageSessionMap.cpp (modified) (1 diff)
• win/ChangeLog (modified) (1 diff)
• win/WebCoreSupport/WebFrameNetworkingContext.cpp (modified) (1 diff)

trunk/Source/WebKitLegacy/ChangeLog

@@ +1 @@
+2019-01-31  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 Alex Christensen.
+
+        * WebCoreSupport/NetworkStorageSessionMap.cpp:
+        (NetworkStorageSessionMap::ensureSession):
+
 2019-01-26  Darin Adler  <darin@apple.com>
   

trunk/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp

@@ -107 +107 @@
 
     addResult.iterator->value = std::make_unique<WebCore::NetworkStorageSession>(sessionID, WTFMove(storageSession), WTFMove(cookieStorage));
+
+#elif USE(CURL)
+    globalSessionMap().ensure(sessionID, [sessionID] {
+        return std::make_unique<WebCore::NetworkStorageSession>(sessionID, nullptr);
+    });
 #endif
 }

trunk/Source/WebKitLegacy/win/ChangeLog

@@ +1 @@
+2019-01-31  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 Alex Christensen.
+
+        * WebCoreSupport/WebFrameNetworkingContext.cpp:
+        (WebFrameNetworkingContext::ensurePrivateBrowsingSession):
+
 2019-01-28  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameNetworkingContext.cpp

@@ -85 +85 @@
     NetworkStorageSessionMap::ensureSession(PAL::SessionID::legacyPrivateSessionID(), base);
 
+#elif USE(CURL)
+    ASSERT(isMainThread());
+
+    NetworkStorageSessionMap::ensureSession(PAL::SessionID::legacyPrivateSessionID());
+
 #endif
     return *NetworkStorageSessionMap::storageSession(PAL::SessionID::legacyPrivateSessionID());