Title: [239884] trunk/Source
Revision
239884
Author
[email protected]
Date
2019-01-11 16:40:14 -0800 (Fri, 11 Jan 2019)

Log Message

Fix style CFNetworkSPI style checker warnings from r239698
https://bugs.webkit.org/show_bug.cgi?id=193369

Reviewed by Joseph Pecoraro.

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 (239883 => 239884)


--- trunk/Source/WTF/ChangeLog	2019-01-12 00:39:30 UTC (rev 239883)
+++ trunk/Source/WTF/ChangeLog	2019-01-12 00:40:14 UTC (rev 239884)
@@ -1,3 +1,12 @@
+2019-01-11  Devin Rousso  <[email protected]>
+
+        Fix style CFNetworkSPI style checker warnings from r239698
+        https://bugs.webkit.org/show_bug.cgi?id=193369
+
+        Reviewed by Joseph Pecoraro.
+
+        * wtf/Platform.h:
+
 2019-01-11  Said Abou-Hallawa  <[email protected]>
 
         WorkQueue::concurrentApply() passes a raw pointer to a temporary String to Thread::create().

Modified: trunk/Source/WTF/wtf/Platform.h (239883 => 239884)


--- trunk/Source/WTF/wtf/Platform.h	2019-01-12 00:39:30 UTC (rev 239883)
+++ trunk/Source/WTF/wtf/Platform.h	2019-01-12 00:40:14 UTC (rev 239884)
@@ -1471,3 +1471,7 @@
 #if (PLATFORM(MAC) && (__MAC_OS_X_VERSION_MIN_REQUIRED == 101200 || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101404))) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000 && __IPHONE_OS_VERSION_MAX_ALLOWED >= 120200) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 50000 && __WATCH_OS_VERSION_MAX_ALLOWED >= 50200) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 120000 && __TV_OS_VERSION_MAX_ALLOWED >= 120200)
 #define HAVE_CFNETWORK_OVERRIDE_SESSION_COOKIE_ACCEPT_POLICY 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
+#endif

Modified: trunk/Source/WebCore/PAL/ChangeLog (239883 => 239884)


--- trunk/Source/WebCore/PAL/ChangeLog	2019-01-12 00:39:30 UTC (rev 239883)
+++ trunk/Source/WebCore/PAL/ChangeLog	2019-01-12 00:40:14 UTC (rev 239884)
@@ -1,3 +1,12 @@
+2019-01-11  Devin Rousso  <[email protected]>
+
+        Fix style CFNetworkSPI style checker warnings from r239698
+        https://bugs.webkit.org/show_bug.cgi?id=193369
+
+        Reviewed by Joseph Pecoraro.
+
+        * pal/spi/cf/CFNetworkSPI.h:
+
 2019-01-10  John Wilander  <[email protected]>
 
         Override the session configuration for cookieAcceptPolicy

Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (239883 => 239884)


--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h	2019-01-12 00:39:30 UTC (rev 239883)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h	2019-01-12 00:40:14 UTC (rev 239884)
@@ -215,7 +215,7 @@
 @end
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
+#if HAVE(CFNETWORK_NEGOTIATED_SSL_PROTOCOL_CIPHER)
 @interface NSURLSessionTaskTransactionMetrics ()
 @property (assign) SSLProtocol _negotiatedTLSProtocol;
 @property (assign) SSLCipherSuite _negotiatedTLSCipher;

Modified: trunk/Source/WebKit/ChangeLog (239883 => 239884)


--- trunk/Source/WebKit/ChangeLog	2019-01-12 00:39:30 UTC (rev 239883)
+++ trunk/Source/WebKit/ChangeLog	2019-01-12 00:40:14 UTC (rev 239884)
@@ -1,3 +1,13 @@
+2019-01-11  Devin Rousso  <[email protected]>
+
+        Fix style CFNetworkSPI style checker warnings from r239698
+        https://bugs.webkit.org/show_bug.cgi?id=193369
+
+        Reviewed by Joseph Pecoraro.
+
+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+        (-[WKNetworkSessionDelegate URLSession:task:didFinishCollectingMetrics:]):
+
 2019-01-11  Wenson Hsieh  <[email protected]>
 
         [iOS] Precision drop state thrashes when dragging near the top edge of an editable element

Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (239883 => 239884)


--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm	2019-01-12 00:39:30 UTC (rev 239883)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm	2019-01-12 00:40:14 UTC (rev 239884)
@@ -93,7 +93,7 @@
     return WebCore::NetworkLoadPriority::Medium;
 }
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
+#if HAVE(CFNETWORK_NEGOTIATED_SSL_PROTOCOL_CIPHER)
 static String stringForSSLProtocol(SSLProtocol protocol)
 {
     switch (protocol) {
@@ -660,7 +660,7 @@
             networkLoadMetrics.connectionIdentifier = String([m._connectionIdentifier UUIDString]);
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
+#if HAVE(CFNETWORK_NEGOTIATED_SSL_PROTOCOL_CIPHER)
             networkLoadMetrics.tlsProtocol = stringForSSLProtocol(m._negotiatedTLSProtocol);
             networkLoadMetrics.tlsCipher = stringForSSLCipher(m._negotiatedTLSCipher);
 #endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to