Title: [240791] trunk/Source/WebKitLegacy
- Revision
- 240791
- Author
- commit-qu...@webkit.org
- Date
- 2019-01-31 09:04:34 -0800 (Thu, 31 Jan 2019)
Log Message
[Curl] Fix DRT crash related to private browsing.
https://bugs.webkit.org/show_bug.cgi?id=193816
Patch by Takashi Komori <takashi.kom...@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):
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/ChangeLog (240790 => 240791)
--- trunk/Source/WebKitLegacy/ChangeLog 2019-01-31 17:02:29 UTC (rev 240790)
+++ trunk/Source/WebKitLegacy/ChangeLog 2019-01-31 17:04:34 UTC (rev 240791)
@@ -1,3 +1,13 @@
+2019-01-31 Takashi Komori <takashi.kom...@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 <da...@apple.com>
Replace many uses of String::format with more type-safe alternatives
Modified: trunk/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp (240790 => 240791)
--- trunk/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp 2019-01-31 17:02:29 UTC (rev 240790)
+++ trunk/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp 2019-01-31 17:04:34 UTC (rev 240791)
@@ -106,6 +106,11 @@
}
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
}
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (240790 => 240791)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2019-01-31 17:02:29 UTC (rev 240790)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2019-01-31 17:04:34 UTC (rev 240791)
@@ -1,3 +1,13 @@
+2019-01-31 Takashi Komori <takashi.kom...@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.kirsl...@sony.com>
Remove unnecessary `using namespace WTF`s (or at least restrict their scope).
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameNetworkingContext.cpp (240790 => 240791)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameNetworkingContext.cpp 2019-01-31 17:02:29 UTC (rev 240790)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebFrameNetworkingContext.cpp 2019-01-31 17:04:34 UTC (rev 240791)
@@ -84,6 +84,11 @@
NetworkStorageSessionMap::ensureSession(PAL::SessionID::legacyPrivateSessionID(), base);
+#elif USE(CURL)
+ ASSERT(isMainThread());
+
+ NetworkStorageSessionMap::ensureSession(PAL::SessionID::legacyPrivateSessionID());
+
#endif
return *NetworkStorageSessionMap::storageSession(PAL::SessionID::legacyPrivateSessionID());
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
