Title: [255610] trunk/Source/WebKit
- Revision
- 255610
- Author
- [email protected]
- Date
- 2020-02-03 15:40:44 -0800 (Mon, 03 Feb 2020)
Log Message
[WK2] Use per-UIProcess default cookie storage for Mac Catalyst apps
https://bugs.webkit.org/show_bug.cgi?id=207139
<rdar://problem/59047014>
Reviewed by Brent Fulgham.
Use per-UIProcess default cookie storage for Mac Catalyst apps, similarly to what
we do for regular macOS apps.
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::encode const):
(WebKit::NetworkProcessCreationParameters::decode):
* NetworkProcess/NetworkProcessCreationParameters.h:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeNetworkProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (255609 => 255610)
--- trunk/Source/WebKit/ChangeLog 2020-02-03 23:38:57 UTC (rev 255609)
+++ trunk/Source/WebKit/ChangeLog 2020-02-03 23:40:44 UTC (rev 255610)
@@ -1,3 +1,24 @@
+2020-02-03 Chris Dumez <[email protected]>
+
+ [WK2] Use per-UIProcess default cookie storage for Mac Catalyst apps
+ https://bugs.webkit.org/show_bug.cgi?id=207139
+ <rdar://problem/59047014>
+
+ Reviewed by Brent Fulgham.
+
+ Use per-UIProcess default cookie storage for Mac Catalyst apps, similarly to what
+ we do for regular macOS apps.
+
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode const):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * NetworkProcess/NetworkProcessCreationParameters.h:
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+
2020-02-03 Wenson Hsieh <[email protected]>
[iOS 13] Dragging on-screen volume control on a YouTube video selects text around the panel
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (255609 => 255610)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2020-02-03 23:38:57 UTC (rev 255609)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2020-02-03 23:40:44 UTC (rev 255610)
@@ -430,7 +430,7 @@
void setNetworkProxySettings(PAL::SessionID, WebCore::CurlProxySettings&&);
#endif
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
static void setSharedHTTPCookieStorage(const Vector<uint8_t>& identifier);
#endif
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (255609 => 255610)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2020-02-03 23:38:57 UTC (rev 255609)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2020-02-03 23:40:44 UTC (rev 255610)
@@ -40,7 +40,7 @@
void NetworkProcessCreationParameters::encode(IPC::Encoder& encoder) const
{
encoder.encodeEnum(cacheModel);
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
encoder << uiProcessCookieStorageIdentifier;
#endif
#if PLATFORM(IOS_FAMILY)
@@ -84,7 +84,7 @@
if (!decoder.decodeEnum(result.cacheModel))
return false;
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
if (!decoder.decode(result.uiProcessCookieStorageIdentifier))
return false;
#endif
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (255609 => 255610)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2020-02-03 23:38:57 UTC (rev 255609)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2020-02-03 23:40:44 UTC (rev 255610)
@@ -53,7 +53,7 @@
CacheModel cacheModel { CacheModel::DocumentViewer };
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
Vector<uint8_t> uiProcessCookieStorageIdentifier;
#endif
#if PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (255609 => 255610)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2020-02-03 23:38:57 UTC (rev 255609)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2020-02-03 23:40:44 UTC (rev 255610)
@@ -95,7 +95,7 @@
initializeNetworkSettings();
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
setSharedHTTPCookieStorage(parameters.uiProcessCookieStorageIdentifier);
#endif
@@ -190,7 +190,7 @@
}).get());
}
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
void NetworkProcess::setSharedHTTPCookieStorage(const Vector<uint8_t>& identifier)
{
ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (255609 => 255610)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-02-03 23:38:57 UTC (rev 255609)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-02-03 23:40:44 UTC (rev 255610)
@@ -388,7 +388,7 @@
parameters.shouldSuppressMemoryPressureHandler = [defaults boolForKey:WebKitSuppressMemoryPressureHandlerDefaultsKey];
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
ASSERT(parameters.uiProcessCookieStorageIdentifier.isEmpty());
ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
parameters.uiProcessCookieStorageIdentifier = identifyingDataFromCookieStorage([[NSHTTPCookieStorage sharedHTTPCookieStorage] _cookieStorage]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
