Title: [213685] trunk/Source/WebKit2
- Revision
- 213685
- Author
- [email protected]
- Date
- 2017-03-09 16:16:02 -0800 (Thu, 09 Mar 2017)
Log Message
Unreviewed follow-up to r213682.
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:task:didFinishCollectingMetrics:]):
Forward declare SPIs to address possible build errors.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (213684 => 213685)
--- trunk/Source/WebKit2/ChangeLog 2017-03-10 00:00:41 UTC (rev 213684)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-10 00:16:02 UTC (rev 213685)
@@ -1,3 +1,11 @@
+2017-03-09 Joseph Pecoraro <[email protected]>
+
+ Unreviewed follow-up to r213682.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:task:didFinishCollectingMetrics:]):
+ Forward declare SPIs to address possible build errors.
+
2017-03-09 Andrew Gold <[email protected]>
WKWebView should provide a way for clients to know the specific media state.
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (213684 => 213685)
--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2017-03-10 00:00:41 UTC (rev 213684)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2017-03-10 00:16:02 UTC (rev 213685)
@@ -52,6 +52,12 @@
#import <wtf/MainThread.h>
#import <wtf/NeverDestroyed.h>
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
+@interface NSURLSessionTaskTransactionMetrics (WKDetails)
+@property (copy, readonly) NSUUID* _connectionIdentifier;
+@end
+#endif
+
using namespace WebKit;
static NSURLSessionResponseDisposition toNSURLSessionResponseDisposition(WebCore::PolicyAction disposition)
@@ -304,7 +310,8 @@
networkLoadMetrics.priority = toNetworkLoadPriority(task.priority);
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
networkLoadMetrics.remoteAddress = String(m._remoteAddressAndPort);
- networkLoadMetrics.connectionIdentifier = String([m._connectionIdentifier UUIDString]);
+ if ([m respondsToSelector:@selector(_connectionIdentifier)])
+ networkLoadMetrics.connectionIdentifier = String([m._connectionIdentifier UUIDString]);
#endif
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
