Title: [275776] branches/safari-612.1.10-branch/Source
- Revision
- 275776
- Author
- [email protected]
- Date
- 2021-04-09 13:37:28 -0700 (Fri, 09 Apr 2021)
Log Message
Cherry-pick r275736. rdar://problem/76467285
Fix incorrect compile-time macro for CFNETWORK_NSURLSESSION_ATTRIBUTED_BUNDLE_IDENTIFIER
https://bugs.webkit.org/show_bug.cgi?id=224347
<rdar://problem/76353792>
Reviewed by Brent Fulgham.
Source/WebCore/PAL:
* pal/spi/cf/CFNetworkSPI.h:
Source/WebKit:
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
(WebKit::NetworkSessionCocoa::SessionSet::initializeEphemeralStatelessSessionIfNeeded):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275736 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.10-branch/Source/WebCore/PAL/ChangeLog (275775 => 275776)
--- branches/safari-612.1.10-branch/Source/WebCore/PAL/ChangeLog 2021-04-09 20:31:51 UTC (rev 275775)
+++ branches/safari-612.1.10-branch/Source/WebCore/PAL/ChangeLog 2021-04-09 20:37:28 UTC (rev 275776)
@@ -1,3 +1,36 @@
+2021-04-09 Alan Coon <[email protected]>
+
+ Cherry-pick r275736. rdar://problem/76467285
+
+ Fix incorrect compile-time macro for CFNETWORK_NSURLSESSION_ATTRIBUTED_BUNDLE_IDENTIFIER
+ https://bugs.webkit.org/show_bug.cgi?id=224347
+ <rdar://problem/76353792>
+
+ Reviewed by Brent Fulgham.
+
+ Source/WebCore/PAL:
+
+ * pal/spi/cf/CFNetworkSPI.h:
+
+ Source/WebKit:
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+ (WebKit::NetworkSessionCocoa::SessionSet::initializeEphemeralStatelessSessionIfNeeded):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275736 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-04-08 Kate Cheney <[email protected]>
+
+ Fix incorrect compile-time macro for CFNETWORK_NSURLSESSION_ATTRIBUTED_BUNDLE_IDENTIFIER
+ https://bugs.webkit.org/show_bug.cgi?id=224347
+ <rdar://problem/76353792>
+
+ Reviewed by Brent Fulgham.
+
+ * pal/spi/cf/CFNetworkSPI.h:
+
2021-04-01 Kimmo Kinnunen <[email protected]>
RemoteRenderingBackend should clean up CG resources after last Canvas is destroyed in Gpu process
Modified: branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (275775 => 275776)
--- branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2021-04-09 20:31:51 UTC (rev 275775)
+++ branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2021-04-09 20:37:28 UTC (rev 275776)
@@ -247,7 +247,7 @@
@property (readwrite, assign) NSInteger _connectionCacheNumFastLanes;
@property (readwrite, assign) NSInteger _connectionCacheMinimumFastLanePriority;
#endif
-#if HAVE(HAVE_CFNETWORK_NSURLSESSION_ATTRIBUTED_BUNDLE_IDENTIFIER)
+#if HAVE(CFNETWORK_NSURLSESSION_ATTRIBUTED_BUNDLE_IDENTIFIER)
@property (nullable, copy) NSString *_attributedBundleIdentifier;
#endif
@end
Modified: branches/safari-612.1.10-branch/Source/WebKit/ChangeLog (275775 => 275776)
--- branches/safari-612.1.10-branch/Source/WebKit/ChangeLog 2021-04-09 20:31:51 UTC (rev 275775)
+++ branches/safari-612.1.10-branch/Source/WebKit/ChangeLog 2021-04-09 20:37:28 UTC (rev 275776)
@@ -1,3 +1,38 @@
+2021-04-09 Alan Coon <[email protected]>
+
+ Cherry-pick r275736. rdar://problem/76467285
+
+ Fix incorrect compile-time macro for CFNETWORK_NSURLSESSION_ATTRIBUTED_BUNDLE_IDENTIFIER
+ https://bugs.webkit.org/show_bug.cgi?id=224347
+ <rdar://problem/76353792>
+
+ Reviewed by Brent Fulgham.
+
+ Source/WebCore/PAL:
+
+ * pal/spi/cf/CFNetworkSPI.h:
+
+ Source/WebKit:
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+ (WebKit::NetworkSessionCocoa::SessionSet::initializeEphemeralStatelessSessionIfNeeded):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275736 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-04-08 Kate Cheney <[email protected]>
+
+ Fix incorrect compile-time macro for CFNETWORK_NSURLSESSION_ATTRIBUTED_BUNDLE_IDENTIFIER
+ https://bugs.webkit.org/show_bug.cgi?id=224347
+ <rdar://problem/76353792>
+
+ Reviewed by Brent Fulgham.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+ (WebKit::NetworkSessionCocoa::SessionSet::initializeEphemeralStatelessSessionIfNeeded):
+
2021-04-08 Russell Epstein <[email protected]>
Cherry-pick r275682. rdar://problem/76424627
Modified: branches/safari-612.1.10-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (275775 => 275776)
--- branches/safari-612.1.10-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2021-04-09 20:31:51 UTC (rev 275775)
+++ branches/safari-612.1.10-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2021-04-09 20:37:28 UTC (rev 275776)
@@ -1218,7 +1218,7 @@
if (!m_sourceApplicationSecondaryIdentifier.isEmpty())
configuration._sourceApplicationSecondaryIdentifier = m_sourceApplicationSecondaryIdentifier;
-#if HAVE(HAVE_CFNETWORK_NSURLSESSION_ATTRIBUTED_BUNDLE_IDENTIFIER)
+#if HAVE(CFNETWORK_NSURLSESSION_ATTRIBUTED_BUNDLE_IDENTIFIER)
if (!m_attributedBundleIdentifier.isEmpty()) {
if ([configuration respondsToSelector:@selector(_attributedBundleIdentifier)])
configuration._attributedBundleIdentifier = m_attributedBundleIdentifier;
@@ -1337,7 +1337,7 @@
#if PLATFORM(IOS_FAMILY)
configuration._CTDataConnectionServiceType = existingConfiguration._CTDataConnectionServiceType;
#endif
-#if HAVE(HAVE_CFNETWORK_NSURLSESSION_ATTRIBUTED_BUNDLE_IDENTIFIER)
+#if HAVE(CFNETWORK_NSURLSESSION_ATTRIBUTED_BUNDLE_IDENTIFIER)
if ([configuration respondsToSelector:@selector(_attributedBundleIdentifier)])
configuration._attributedBundleIdentifier = existingConfiguration._attributedBundleIdentifier;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
