Title: [237999] tags/Safari-607.1.13/Source
- Revision
- 237999
- Author
- [email protected]
- Date
- 2018-11-08 13:15:24 -0800 (Thu, 08 Nov 2018)
Log Message
Cherry-pick r237952. rdar://problem/45894288
Unreviewed, fix iOS build with recent SDKs.
Source/WebCore:
* platform/network/cocoa/ResourceResponseCocoa.mm:
(WebCore::ResourceResponse::platformCertificateInfo const):
Source/WebKit:
* UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:
(-[WKFullScreenWindowController _EVOrganizationName]):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237952 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: tags/Safari-607.1.13/Source/WebCore/ChangeLog (237998 => 237999)
--- tags/Safari-607.1.13/Source/WebCore/ChangeLog 2018-11-08 21:15:20 UTC (rev 237998)
+++ tags/Safari-607.1.13/Source/WebCore/ChangeLog 2018-11-08 21:15:24 UTC (rev 237999)
@@ -1,5 +1,30 @@
2018-11-08 Kocsen Chung <[email protected]>
+ Cherry-pick r237952. rdar://problem/45894288
+
+ Unreviewed, fix iOS build with recent SDKs.
+
+ Source/WebCore:
+
+ * platform/network/cocoa/ResourceResponseCocoa.mm:
+ (WebCore::ResourceResponse::platformCertificateInfo const):
+
+ Source/WebKit:
+
+ * UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:
+ (-[WKFullScreenWindowController _EVOrganizationName]):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237952 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-11-07 Chris Dumez <[email protected]>
+
+ Unreviewed, fix iOS build with recent SDKs.
+
+ * platform/network/cocoa/ResourceResponseCocoa.mm:
+ (WebCore::ResourceResponse::platformCertificateInfo const):
+
+2018-11-08 Kocsen Chung <[email protected]>
+
Cherry-pick r237951. rdar://problem/45894288
Unreviewed, fix iOS build with recent SDKs.
Modified: tags/Safari-607.1.13/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm (237998 => 237999)
--- tags/Safari-607.1.13/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm 2018-11-08 21:15:20 UTC (rev 237998)
+++ tags/Safari-607.1.13/Source/WebCore/platform/network/cocoa/ResourceResponseCocoa.mm 2018-11-08 21:15:24 UTC (rev 237999)
@@ -98,6 +98,7 @@
return { };
if (trustResultType == kSecTrustResultInvalid) {
+ // FIXME: This is deprecated <rdar://problem/45894288>.
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
result = SecTrustEvaluate(trust, &trustResultType);
Modified: tags/Safari-607.1.13/Source/WebKit/ChangeLog (237998 => 237999)
--- tags/Safari-607.1.13/Source/WebKit/ChangeLog 2018-11-08 21:15:20 UTC (rev 237998)
+++ tags/Safari-607.1.13/Source/WebKit/ChangeLog 2018-11-08 21:15:24 UTC (rev 237999)
@@ -1,3 +1,28 @@
+2018-11-08 Kocsen Chung <[email protected]>
+
+ Cherry-pick r237952. rdar://problem/45894288
+
+ Unreviewed, fix iOS build with recent SDKs.
+
+ Source/WebCore:
+
+ * platform/network/cocoa/ResourceResponseCocoa.mm:
+ (WebCore::ResourceResponse::platformCertificateInfo const):
+
+ Source/WebKit:
+
+ * UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:
+ (-[WKFullScreenWindowController _EVOrganizationName]):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237952 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-11-07 Chris Dumez <[email protected]>
+
+ Unreviewed, fix iOS build with recent SDKs.
+
+ * UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:
+ (-[WKFullScreenWindowController _EVOrganizationName]):
+
2018-11-07 Alan Coon <[email protected]>
Revert r237919. rdar://problem/45895377
Modified: tags/Safari-607.1.13/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm (237998 => 237999)
--- tags/Safari-607.1.13/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm 2018-11-08 21:15:20 UTC (rev 237998)
+++ tags/Safari-607.1.13/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm 2018-11-08 21:15:24 UTC (rev 237999)
@@ -905,7 +905,13 @@
// and the only way to get the information we need is to call SecTrustEvaluate ourselves.
if (!infoDictionary) {
SecTrustResultType result = kSecTrustResultProceed;
+
+ // FIXME: This is deprecated <rdar://problem/45894288>.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
OSStatus err = SecTrustEvaluate(trust, &result);
+#pragma clang diagnostic pop
+
if (err == noErr)
infoDictionary = [(__bridge NSDictionary *)SecTrustCopyInfo(trust) autorelease];
if (!infoDictionary)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
