Undo collision with r243390.
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 23 Mar 2019 00:59:53 +0000 (00:59 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 23 Mar 2019 00:59:53 +0000 (00:59 +0000)
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(stringForSSLProtocol):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243407 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm

index 3753eb7..91d5352 100644 (file)
@@ -1,5 +1,12 @@
 2019-03-22  Simon Fraser  <simon.fraser@apple.com>
 
+        Undo collision with r243390.
+
+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+        (stringForSSLProtocol):
+
+2019-03-22  Simon Fraser  <simon.fraser@apple.com>
+
         Fix internal builds.
 
         * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
index 341cded..f5731fe 100644 (file)
@@ -107,7 +107,6 @@ static String stringForSSLProtocol(SSLProtocol protocol)
 {
     ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     switch (protocol) {
-ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     case kDTLSProtocol1:
         return "DTLS 1.0"_s;
     case kSSLProtocol2:
@@ -131,7 +130,6 @@ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     case kSSLProtocolUnknown:
         return "Unknown";
     case kTLSProtocolMaxSupported:
-ALLOW_DEPRECATED_DECLARATIONS_END
     default:
         ASSERT_NOT_REACHED();
         return emptyString();