Attachment 358954 Details for Bug 193369 – Patch

[patch] Patch

bug-193369-20190111161252.patch (text/plain), 4.94 KB, created by Devin Rousso on 2019-01-11 15:12:53 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-01-11 15:12:53 PST

Size: 4.94 KB

patch

obsolete

>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 609cebe217ddf33fb075a60b38aaed8c340c7462..e8e9bc4cfab96e897baab82ed8a758ca6b6e86fc 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-01-11  Devin Rousso  <drousso@apple.com>
>+
>+        Fix style CFNetworkSPI style checker warnings from r239698
>+        https://bugs.webkit.org/show_bug.cgi?id=193369
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wtf/Platform.h:
>+
> 2019-01-11  Dominik Infuehr  <dinfuehr@igalia.com>
> 
>         Enable DFG on ARM/Linux again
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 5a10d74915990661294e920d87eab81002b27efb..c9a9d7de6250a2c1935cd1105f68c74eaeff26ee 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-01-11  Devin Rousso  <drousso@apple.com>
>+
>+        Fix style CFNetworkSPI style checker warnings from r239698
>+        https://bugs.webkit.org/show_bug.cgi?id=193369
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * pal/spi/cf/CFNetworkSPI.h:
>+
> 2019-01-10  John Wilander  <wilander@apple.com>
> 
>         Override the session configuration for cookieAcceptPolicy
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index d53cc33c6927e61aa4e69dae90da8051257de925..4e4b8e77ce2191b88600d05811d77cf58ce36d2e 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-01-11  Devin Rousso  <drousso@apple.com>
>+
>+        Fix style CFNetworkSPI style checker warnings from r239698
>+        https://bugs.webkit.org/show_bug.cgi?id=193369
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
>+        (-[WKNetworkSessionDelegate URLSession:task:didFinishCollectingMetrics:]):
>+
> 2019-01-11  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Introduce IDL files for runtime-enabled UndoManager and UndoItem JavaScript API
>diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
>index a574b04eb32d3188820f04ddb7ddba9036a3c973..8df952e8bed2231558af56c456a2519b559937c6 100644
>--- a/Source/WTF/wtf/Platform.h
>+++ b/Source/WTF/wtf/Platform.h
>@@ -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
>diff --git a/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h b/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>index 2cf3dc3e9eaa4eaf4bff4b01a1267ee59c7c7205..5c4e983b4f4c0871cb3fb079aaa8da3053590d31 100644
>--- a/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>@@ -215,7 +215,7 @@ typedef NS_ENUM(NSInteger, NSURLSessionCompanionProxyPreference) {
> @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;
>diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
>index f856ff5522ba9c4c2b0e6a785b466e336db6f58e..0ecd886eb40f0802b112cb77796152f518937442 100644
>--- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
>+++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
>@@ -93,7 +93,7 @@ static WebCore::NetworkLoadPriority toNetworkLoadPriority(float priority)
>     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 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didFini
>             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

Actions: View | Formatted Diff | Diff

Attachments on bug 193369: 358954