Title: [256255] branches/safari-609-branch/Source/WebKit
- Revision
- 256255
- Author
- alanc...@apple.com
- Date
- 2020-02-10 22:24:41 -0800 (Mon, 10 Feb 2020)
Log Message
Cherry-pick r255610. rdar://problem/59298157
[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):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@255610 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609-branch/Source/WebKit/ChangeLog (256254 => 256255)
--- branches/safari-609-branch/Source/WebKit/ChangeLog 2020-02-11 06:24:37 UTC (rev 256254)
+++ branches/safari-609-branch/Source/WebKit/ChangeLog 2020-02-11 06:24:41 UTC (rev 256255)
@@ -1,5 +1,51 @@
2020-02-10 Kocsen Chung <kocsen_ch...@apple.com>
+ Cherry-pick r255610. rdar://problem/59298157
+
+ [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):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@255610 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-02-03 Chris Dumez <cdu...@apple.com>
+
+ [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-10 Kocsen Chung <kocsen_ch...@apple.com>
+
Cherry-pick r255603. rdar://problem/59299321
[iOS 13] Dragging on-screen volume control on a YouTube video selects text around the panel
Modified: branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkProcess.h (256254 => 256255)
--- branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkProcess.h 2020-02-11 06:24:37 UTC (rev 256254)
+++ branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkProcess.h 2020-02-11 06:24:41 UTC (rev 256255)
@@ -427,7 +427,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: branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (256254 => 256255)
--- branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2020-02-11 06:24:37 UTC (rev 256254)
+++ branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2020-02-11 06:24:41 UTC (rev 256255)
@@ -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: branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (256254 => 256255)
--- branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2020-02-11 06:24:37 UTC (rev 256254)
+++ branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2020-02-11 06:24:41 UTC (rev 256255)
@@ -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: branches/safari-609-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (256254 => 256255)
--- branches/safari-609-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2020-02-11 06:24:37 UTC (rev 256254)
+++ branches/safari-609-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2020-02-11 06:24:41 UTC (rev 256255)
@@ -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: branches/safari-609-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (256254 => 256255)
--- branches/safari-609-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-02-11 06:24:37 UTC (rev 256254)
+++ branches/safari-609-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-02-11 06:24:41 UTC (rev 256255)
@@ -372,7 +372,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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
