Title: [258111] trunk/Source/WebKit
- Revision
- 258111
- Author
- timothy_hor...@apple.com
- Date
- 2020-03-08 13:31:31 -0700 (Sun, 08 Mar 2020)
Log Message
Fix the watchOS build
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:task:didFinishCollectingMetrics:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (258110 => 258111)
--- trunk/Source/WebKit/ChangeLog 2020-03-08 20:03:25 UTC (rev 258110)
+++ trunk/Source/WebKit/ChangeLog 2020-03-08 20:31:31 UTC (rev 258111)
@@ -1,3 +1,10 @@
+2020-03-08 Tim Horton <timothy_hor...@apple.com>
+
+ Fix the watchOS build
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:task:didFinishCollectingMetrics:]):
+
2020-03-08 Megan Gardner <megan_gard...@apple.com>
Build Fix
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (258110 => 258111)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2020-03-08 20:03:25 UTC (rev 258110)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2020-03-08 20:31:31 UTC (rev 258111)
@@ -778,7 +778,9 @@
else
networkLoadMetrics.remoteAddress = m.remoteAddress;
#else
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
networkLoadMetrics.remoteAddress = String(m._remoteAddressAndPort);
+ ALLOW_DEPRECATED_DECLARATIONS_END
#endif
networkLoadMetrics.connectionIdentifier = String([m._connectionIdentifier UUIDString]);
@@ -787,8 +789,10 @@
networkLoadMetrics.tlsProtocol = stringForTLSProtocolVersion((tls_protocol_version_t)[m.negotiatedTLSProtocolVersion unsignedShortValue]);
networkLoadMetrics.tlsCipher = stringForTLSCipherSuite((tls_ciphersuite_t)[m.negotiatedTLSCipherSuite unsignedShortValue]);
#else
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
networkLoadMetrics.tlsProtocol = stringForSSLProtocol(m._negotiatedTLSProtocol);
networkLoadMetrics.tlsCipher = stringForSSLCipher(m._negotiatedTLSCipher);
+ ALLOW_DEPRECATED_DECLARATIONS_END
#endif
#endif
@@ -810,10 +814,12 @@
responseBodyBytesReceived += transactionMetrics.countOfResponseBodyBytesReceived;
responseBodyDecodedSize += transactionMetrics.countOfResponseBodyBytesAfterDecoding ? transactionMetrics.countOfResponseBodyBytesAfterDecoding : transactionMetrics.countOfResponseBodyBytesReceived;
#else
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
requestHeaderBytesSent += transactionMetrics._requestHeaderBytesSent;
responseHeaderBytesReceived += transactionMetrics._responseHeaderBytesReceived;
responseBodyBytesReceived += transactionMetrics._responseBodyBytesReceived;
responseBodyDecodedSize += transactionMetrics._responseBodyBytesDecoded ? transactionMetrics._responseBodyBytesDecoded : transactionMetrics._responseBodyBytesReceived;
+ ALLOW_DEPRECATED_DECLARATIONS_END
#endif
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
