Title: [274429] trunk/Source/WebCore
- Revision
- 274429
- Author
- cdu...@apple.com
- Date
- 2021-03-15 10:41:04 -0700 (Mon, 15 Mar 2021)
Log Message
Stop calling [NSHTTPCookieStorage sharedHTTPCookieStorage] in the WebProcess
https://bugs.webkit.org/show_bug.cgi?id=223186
<rdar://75018105>
Reviewed by Geoffrey Garen.
NetworkStorageSession::nsCookieStorage() was calling [NSHTTPCookieStorage sharedHTTPCookieStorage]
even if cookieStorage() is not nil. I updated the condition so that we do not attempt to call
[NSHTTPCookieStorage sharedHTTPCookieStorage] when the m_isInMemoryCookieStore flag is set. The
WebProcess is using an in-memory cookie store (thus has m_isInMemoryCookieStore flag set) and
is definitely not using the shared HTTP cookie store.
* platform/network/cocoa/NetworkStorageSessionCocoa.mm:
(WebCore::NetworkStorageSession::nsCookieStorage const):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (274428 => 274429)
--- trunk/Source/WebCore/ChangeLog 2021-03-15 17:38:42 UTC (rev 274428)
+++ trunk/Source/WebCore/ChangeLog 2021-03-15 17:41:04 UTC (rev 274429)
@@ -1,3 +1,20 @@
+2021-03-15 Chris Dumez <cdu...@apple.com>
+
+ Stop calling [NSHTTPCookieStorage sharedHTTPCookieStorage] in the WebProcess
+ https://bugs.webkit.org/show_bug.cgi?id=223186
+ <rdar://75018105>
+
+ Reviewed by Geoffrey Garen.
+
+ NetworkStorageSession::nsCookieStorage() was calling [NSHTTPCookieStorage sharedHTTPCookieStorage]
+ even if cookieStorage() is not nil. I updated the condition so that we do not attempt to call
+ [NSHTTPCookieStorage sharedHTTPCookieStorage] when the m_isInMemoryCookieStore flag is set. The
+ WebProcess is using an in-memory cookie store (thus has m_isInMemoryCookieStore flag set) and
+ is definitely not using the shared HTTP cookie store.
+
+ * platform/network/cocoa/NetworkStorageSessionCocoa.mm:
+ (WebCore::NetworkStorageSession::nsCookieStorage const):
+
2021-03-15 Youenn Fablet <you...@apple.com>
Add a WebAudio quirk for Zoom
Modified: trunk/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm (274428 => 274429)
--- trunk/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm 2021-03-15 17:38:42 UTC (rev 274428)
+++ trunk/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm 2021-03-15 17:41:04 UTC (rev 274429)
@@ -159,7 +159,8 @@
{
ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies) || m_isInMemoryCookieStore);
auto cfCookieStorage = cookieStorage();
- if (!cfCookieStorage || [NSHTTPCookieStorage sharedHTTPCookieStorage]._cookieStorage == cfCookieStorage)
+ ASSERT(cfCookieStorage || !m_isInMemoryCookieStore);
+ if (!m_isInMemoryCookieStore && (!cfCookieStorage || [NSHTTPCookieStorage sharedHTTPCookieStorage]._cookieStorage == cfCookieStorage))
return [NSHTTPCookieStorage sharedHTTPCookieStorage];
return adoptNS([[NSHTTPCookieStorage alloc] _initWithCFHTTPCookieStorage:cfCookieStorage.get()]).autorelease();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
