Diff
Modified: tags/Safari-608.1.33.2/Source/WTF/ChangeLog (247177 => 247178)
--- tags/Safari-608.1.33.2/Source/WTF/ChangeLog 2019-07-05 21:45:21 UTC (rev 247177)
+++ tags/Safari-608.1.33.2/Source/WTF/ChangeLog 2019-07-05 21:47:17 UTC (rev 247178)
@@ -1,3 +1,35 @@
+2019-07-05 Babak Shafiei <bshaf...@apple.com>
+
+ Cherry-pick r247095. rdar://problem/52695729
+
+ Unreviewed, rolling out r246616.
+
+ Caused http/tests/inspector/network/har/har-page.html to fail
+ on Catalina.
+
+ Reverted changeset:
+
+ "Web Inspector: Network: replace CFNetwork SPI with new API
+ where able"
+ https://bugs.webkit.org/show_bug.cgi?id=198762
+ https://trac.webkit.org/changeset/246616
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247095 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-07-03 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r246616.
+
+ Caused http/tests/inspector/network/har/har-page.html to fail
+ on Catalina.
+
+ Reverted changeset:
+
+ "Web Inspector: Network: replace CFNetwork SPI with new API
+ where able"
+ https://bugs.webkit.org/show_bug.cgi?id=198762
+ https://trac.webkit.org/changeset/246616
+
2019-07-02 Keith Miller <keith_mil...@apple.com>
PACCage should first cage leaving PAC bits intact then authenticate
Modified: tags/Safari-608.1.33.2/Source/WTF/wtf/Platform.h (247177 => 247178)
--- tags/Safari-608.1.33.2/Source/WTF/wtf/Platform.h 2019-07-05 21:45:21 UTC (rev 247177)
+++ tags/Safari-608.1.33.2/Source/WTF/wtf/Platform.h 2019-07-05 21:47:17 UTC (rev 247178)
@@ -1511,13 +1511,8 @@
#define HAVE_CFNETWORK_NSURLSESSION_STRICTRUSTEVALUATE 1
#endif
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
-#define HAVE_CFNETWORK_NSURLSESSIONTASKTRANSACTIONMETRICS_SPI 1
-#endif
-
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
#define HAVE_CFNETWORK_NEGOTIATED_SSL_PROTOCOL_CIPHER 1
-#define HAVE_CFNETWORK_NSURLSESSIONTASKTRANSACTIONMETRICS_ADDITIONS 1
#endif
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
Modified: tags/Safari-608.1.33.2/Source/WebCore/ChangeLog (247177 => 247178)
--- tags/Safari-608.1.33.2/Source/WebCore/ChangeLog 2019-07-05 21:45:21 UTC (rev 247177)
+++ tags/Safari-608.1.33.2/Source/WebCore/ChangeLog 2019-07-05 21:47:17 UTC (rev 247178)
@@ -1,3 +1,35 @@
+2019-07-05 Babak Shafiei <bshaf...@apple.com>
+
+ Cherry-pick r247095. rdar://problem/52695729
+
+ Unreviewed, rolling out r246616.
+
+ Caused http/tests/inspector/network/har/har-page.html to fail
+ on Catalina.
+
+ Reverted changeset:
+
+ "Web Inspector: Network: replace CFNetwork SPI with new API
+ where able"
+ https://bugs.webkit.org/show_bug.cgi?id=198762
+ https://trac.webkit.org/changeset/246616
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247095 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-07-03 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r246616.
+
+ Caused http/tests/inspector/network/har/har-page.html to fail
+ on Catalina.
+
+ Reverted changeset:
+
+ "Web Inspector: Network: replace CFNetwork SPI with new API
+ where able"
+ https://bugs.webkit.org/show_bug.cgi?id=198762
+ https://trac.webkit.org/changeset/246616
+
2019-07-02 Alan Coon <alanc...@apple.com>
Revert r247015. rdar://problem/52552864
Modified: tags/Safari-608.1.33.2/Source/WebCore/PAL/ChangeLog (247177 => 247178)
--- tags/Safari-608.1.33.2/Source/WebCore/PAL/ChangeLog 2019-07-05 21:45:21 UTC (rev 247177)
+++ tags/Safari-608.1.33.2/Source/WebCore/PAL/ChangeLog 2019-07-05 21:47:17 UTC (rev 247178)
@@ -1,3 +1,35 @@
+2019-07-05 Babak Shafiei <bshaf...@apple.com>
+
+ Cherry-pick r247095. rdar://problem/52695729
+
+ Unreviewed, rolling out r246616.
+
+ Caused http/tests/inspector/network/har/har-page.html to fail
+ on Catalina.
+
+ Reverted changeset:
+
+ "Web Inspector: Network: replace CFNetwork SPI with new API
+ where able"
+ https://bugs.webkit.org/show_bug.cgi?id=198762
+ https://trac.webkit.org/changeset/246616
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247095 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-07-03 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r246616.
+
+ Caused http/tests/inspector/network/har/har-page.html to fail
+ on Catalina.
+
+ Reverted changeset:
+
+ "Web Inspector: Network: replace CFNetwork SPI with new API
+ where able"
+ https://bugs.webkit.org/show_bug.cgi?id=198762
+ https://trac.webkit.org/changeset/246616
+
2019-06-28 Brent Fulgham <bfulg...@apple.com>
[FTW] Build WebCore
Modified: tags/Safari-608.1.33.2/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (247177 => 247178)
--- tags/Safari-608.1.33.2/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2019-07-05 21:45:21 UTC (rev 247177)
+++ tags/Safari-608.1.33.2/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2019-07-05 21:47:17 UTC (rev 247178)
@@ -222,7 +222,7 @@
#endif
@end
-#if HAVE(CFNETWORK_NSURLSESSIONTASKTRANSACTIONMETRICS_SPI)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
@interface NSURLSessionTaskTransactionMetrics ()
@property (copy, readonly) NSString* _remoteAddressAndPort;
@property (copy, readonly) NSUUID* _connectionIdentifier;
Modified: tags/Safari-608.1.33.2/Source/WebCore/platform/network/NetworkLoadMetrics.h (247177 => 247178)
--- tags/Safari-608.1.33.2/Source/WebCore/platform/network/NetworkLoadMetrics.h 2019-07-05 21:45:21 UTC (rev 247177)
+++ tags/Safari-608.1.33.2/Source/WebCore/platform/network/NetworkLoadMetrics.h 2019-07-05 21:47:17 UTC (rev 247178)
@@ -176,8 +176,8 @@
HTTPHeaderMap requestHeaders;
- uint64_t requestHeaderBytesSent;
- uint64_t responseHeaderBytesReceived;
+ uint32_t requestHeaderBytesSent;
+ uint32_t responseHeaderBytesReceived;
uint64_t requestBodyBytesSent;
uint64_t responseBodyBytesReceived;
uint64_t responseBodyDecodedSize;
Modified: tags/Safari-608.1.33.2/Source/WebKit/ChangeLog (247177 => 247178)
--- tags/Safari-608.1.33.2/Source/WebKit/ChangeLog 2019-07-05 21:45:21 UTC (rev 247177)
+++ tags/Safari-608.1.33.2/Source/WebKit/ChangeLog 2019-07-05 21:47:17 UTC (rev 247178)
@@ -1,3 +1,35 @@
+2019-07-05 Babak Shafiei <bshaf...@apple.com>
+
+ Cherry-pick r247095. rdar://problem/52695729
+
+ Unreviewed, rolling out r246616.
+
+ Caused http/tests/inspector/network/har/har-page.html to fail
+ on Catalina.
+
+ Reverted changeset:
+
+ "Web Inspector: Network: replace CFNetwork SPI with new API
+ where able"
+ https://bugs.webkit.org/show_bug.cgi?id=198762
+ https://trac.webkit.org/changeset/246616
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247095 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-07-03 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r246616.
+
+ Caused http/tests/inspector/network/har/har-page.html to fail
+ on Catalina.
+
+ Reverted changeset:
+
+ "Web Inspector: Network: replace CFNetwork SPI with new API
+ where able"
+ https://bugs.webkit.org/show_bug.cgi?id=198762
+ https://trac.webkit.org/changeset/246616
+
2019-07-02 Alan Coon <alanc...@apple.com>
Revert r247015. rdar://problem/52552864
Modified: tags/Safari-608.1.33.2/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (247177 => 247178)
--- tags/Safari-608.1.33.2/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-07-05 21:45:21 UTC (rev 247177)
+++ tags/Safari-608.1.33.2/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-07-05 21:47:17 UTC (rev 247178)
@@ -682,7 +682,7 @@
if (networkDataTask->shouldCaptureExtraNetworkLoadMetrics()) {
networkLoadMetrics.priority = toNetworkLoadPriority(task.priority);
-#if HAVE(CFNETWORK_NSURLSESSIONTASKTRANSACTIONMETRICS_SPI)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
networkLoadMetrics.remoteAddress = String(m._remoteAddressAndPort);
networkLoadMetrics.connectionIdentifier = String([m._connectionIdentifier UUIDString]);
#endif
@@ -698,21 +698,7 @@
}];
networkLoadMetrics.requestHeaders = WTFMove(requestHeaders);
-#if HAVE(CFNETWORK_NSURLSESSIONTASKTRANSACTIONMETRICS_ADDITIONS)
- networkLoadMetrics.requestHeaderBytesSent = 0;
- networkLoadMetrics.requestBodyBytesSent = 0;
- networkLoadMetrics.responseHeaderBytesReceived = 0;
- networkLoadMetrics.responseBodyBytesReceived = 0;
- networkLoadMetrics.responseBodyDecodedSize = 0;
-
- for (NSURLSessionTaskTransactionMetrics *transactionMetrics in metrics.transactionMetrics) {
- networkLoadMetrics.requestHeaderBytesSent += transactionMetrics.countOfRequestHeaderBytesSent;
- networkLoadMetrics.requestBodyBytesSent += transactionMetrics.countOfRequestBodyBytesSent;
- networkLoadMetrics.responseHeaderBytesReceived += transactionMetrics.countOfResponseHeaderBytesReceived;
- networkLoadMetrics.responseBodyBytesReceived += transactionMetrics.countOfResponseBodyBytesReceived;
- networkLoadMetrics.responseBodyDecodedSize += transactionMetrics.countOfResponseBodyBytesAfterDecoding;
- }
-#elif HAVE(CFNETWORK_NSURLSESSIONTASKTRANSACTIONMETRICS_SPI)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
uint64_t requestHeaderBytesSent = 0;
uint64_t responseHeaderBytesReceived = 0;
uint64_t responseBodyBytesReceived = 0;
