Title: [246616] trunk/Source
- Revision
- 246616
- Author
- [email protected]
- Date
- 2019-06-19 17:13:59 -0700 (Wed, 19 Jun 2019)
Log Message
Web Inspector: Network: replace CFNetwork SPI with new API where able
https://bugs.webkit.org/show_bug.cgi?id=198762
Reviewed by Timothy Hatcher.
Source/WebCore:
* platform/network/NetworkLoadMetrics.h:
Source/WebCore/PAL:
* pal/spi/cf/CFNetworkSPI.h:
Source/WebKit:
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:task:didFinishCollectingMetrics:]):
Source/WTF:
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (246615 => 246616)
--- trunk/Source/WTF/ChangeLog 2019-06-19 23:36:35 UTC (rev 246615)
+++ trunk/Source/WTF/ChangeLog 2019-06-20 00:13:59 UTC (rev 246616)
@@ -1,3 +1,12 @@
+2019-06-19 Devin Rousso <[email protected]>
+
+ Web Inspector: Network: replace CFNetwork SPI with new API where able
+ https://bugs.webkit.org/show_bug.cgi?id=198762
+
+ Reviewed by Timothy Hatcher.
+
+ * wtf/Platform.h:
+
2019-06-19 Alex Christensen <[email protected]>
Add a unit test for client certificate authentication
Modified: trunk/Source/WTF/wtf/Platform.h (246615 => 246616)
--- trunk/Source/WTF/wtf/Platform.h 2019-06-19 23:36:35 UTC (rev 246615)
+++ trunk/Source/WTF/wtf/Platform.h 2019-06-20 00:13:59 UTC (rev 246616)
@@ -1514,8 +1514,13 @@
#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: trunk/Source/WebCore/ChangeLog (246615 => 246616)
--- trunk/Source/WebCore/ChangeLog 2019-06-19 23:36:35 UTC (rev 246615)
+++ trunk/Source/WebCore/ChangeLog 2019-06-20 00:13:59 UTC (rev 246616)
@@ -1,3 +1,12 @@
+2019-06-19 Devin Rousso <[email protected]>
+
+ Web Inspector: Network: replace CFNetwork SPI with new API where able
+ https://bugs.webkit.org/show_bug.cgi?id=198762
+
+ Reviewed by Timothy Hatcher.
+
+ * platform/network/NetworkLoadMetrics.h:
+
2019-06-19 Jer Noble <[email protected]>
iOS 12.2 Drawing portrait video to canvas is sideways
Modified: trunk/Source/WebCore/PAL/ChangeLog (246615 => 246616)
--- trunk/Source/WebCore/PAL/ChangeLog 2019-06-19 23:36:35 UTC (rev 246615)
+++ trunk/Source/WebCore/PAL/ChangeLog 2019-06-20 00:13:59 UTC (rev 246616)
@@ -1,3 +1,12 @@
+2019-06-19 Devin Rousso <[email protected]>
+
+ Web Inspector: Network: replace CFNetwork SPI with new API where able
+ https://bugs.webkit.org/show_bug.cgi?id=198762
+
+ Reviewed by Timothy Hatcher.
+
+ * pal/spi/cf/CFNetworkSPI.h:
+
2019-06-18 Dean Jackson <[email protected]>
UIContextMenuInteraction implementation for WKContentView
Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (246615 => 246616)
--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2019-06-19 23:36:35 UTC (rev 246615)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2019-06-20 00:13:59 UTC (rev 246616)
@@ -214,7 +214,7 @@
#endif
@end
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
+#if HAVE(CFNETWORK_NSURLSESSIONTASKTRANSACTIONMETRICS_SPI)
@interface NSURLSessionTaskTransactionMetrics ()
@property (copy, readonly) NSString* _remoteAddressAndPort;
@property (copy, readonly) NSUUID* _connectionIdentifier;
Modified: trunk/Source/WebCore/platform/network/NetworkLoadMetrics.h (246615 => 246616)
--- trunk/Source/WebCore/platform/network/NetworkLoadMetrics.h 2019-06-19 23:36:35 UTC (rev 246615)
+++ trunk/Source/WebCore/platform/network/NetworkLoadMetrics.h 2019-06-20 00:13:59 UTC (rev 246616)
@@ -176,8 +176,8 @@
HTTPHeaderMap requestHeaders;
- uint32_t requestHeaderBytesSent;
- uint32_t responseHeaderBytesReceived;
+ uint64_t requestHeaderBytesSent;
+ uint64_t responseHeaderBytesReceived;
uint64_t requestBodyBytesSent;
uint64_t responseBodyBytesReceived;
uint64_t responseBodyDecodedSize;
Modified: trunk/Source/WebKit/ChangeLog (246615 => 246616)
--- trunk/Source/WebKit/ChangeLog 2019-06-19 23:36:35 UTC (rev 246615)
+++ trunk/Source/WebKit/ChangeLog 2019-06-20 00:13:59 UTC (rev 246616)
@@ -1,3 +1,13 @@
+2019-06-19 Devin Rousso <[email protected]>
+
+ Web Inspector: Network: replace CFNetwork SPI with new API where able
+ https://bugs.webkit.org/show_bug.cgi?id=198762
+
+ Reviewed by Timothy Hatcher.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:task:didFinishCollectingMetrics:]):
+
2019-06-19 Alex Christensen <[email protected]>
DownloadMonitor::measuredThroughputRate should approach zero with no throughput
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (246615 => 246616)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-06-19 23:36:35 UTC (rev 246615)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-06-20 00:13:59 UTC (rev 246616)
@@ -682,7 +682,7 @@
if (networkDataTask->shouldCaptureExtraNetworkLoadMetrics()) {
networkLoadMetrics.priority = toNetworkLoadPriority(task.priority);
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
+#if HAVE(CFNETWORK_NSURLSESSIONTASKTRANSACTIONMETRICS_SPI)
networkLoadMetrics.remoteAddress = String(m._remoteAddressAndPort);
networkLoadMetrics.connectionIdentifier = String([m._connectionIdentifier UUIDString]);
#endif
@@ -698,7 +698,21 @@
}];
networkLoadMetrics.requestHeaders = WTFMove(requestHeaders);
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
+#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)
uint64_t requestHeaderBytesSent = 0;
uint64_t responseHeaderBytesReceived = 0;
uint64_t responseBodyBytesReceived = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
