Title: [243407] trunk/Source/WebKit
- Revision
- 243407
- Author
- simon.fra...@apple.com
- Date
- 2019-03-22 17:59:53 -0700 (Fri, 22 Mar 2019)
Log Message
Undo collision with r243390.
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(stringForSSLProtocol):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (243406 => 243407)
--- trunk/Source/WebKit/ChangeLog 2019-03-23 00:56:20 UTC (rev 243406)
+++ trunk/Source/WebKit/ChangeLog 2019-03-23 00:59:53 UTC (rev 243407)
@@ -1,5 +1,12 @@
2019-03-22 Simon Fraser <simon.fra...@apple.com>
+ Undo collision with r243390.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (stringForSSLProtocol):
+
+2019-03-22 Simon Fraser <simon.fra...@apple.com>
+
Fix internal builds.
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (243406 => 243407)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-03-23 00:56:20 UTC (rev 243406)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-03-23 00:59:53 UTC (rev 243407)
@@ -107,7 +107,6 @@
{
ALLOW_DEPRECATED_DECLARATIONS_BEGIN
switch (protocol) {
-ALLOW_DEPRECATED_DECLARATIONS_BEGIN
case kDTLSProtocol1:
return "DTLS 1.0"_s;
case kSSLProtocol2:
@@ -131,7 +130,6 @@
case kSSLProtocolUnknown:
return "Unknown";
case kTLSProtocolMaxSupported:
-ALLOW_DEPRECATED_DECLARATIONS_END
default:
ASSERT_NOT_REACHED();
return emptyString();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
