Title: [229521] trunk/Source/WebKit
- Revision
- 229521
- Author
- wenson_hs...@apple.com
- Date
- 2018-03-11 20:38:22 -0700 (Sun, 11 Mar 2018)
Log Message
Fix the internal iOS build after r229512
https://bugs.webkit.org/show_bug.cgi?id=183550
Reviewed by Zalan Bujtas.
Fixes a typo in a header import, as well as a nullability error. `SecTrustEvaluate()` takes in a nonnull outparam,
which was removed in r229512; this adds the outparam back, but does not consult its value when setting the
`infoDictionary`.
* UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:
(-[WKFullScreenWindowController _EVOrganizationName]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (229520 => 229521)
--- trunk/Source/WebKit/ChangeLog 2018-03-12 03:25:39 UTC (rev 229520)
+++ trunk/Source/WebKit/ChangeLog 2018-03-12 03:38:22 UTC (rev 229521)
@@ -1,3 +1,17 @@
+2018-03-11 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Fix the internal iOS build after r229512
+ https://bugs.webkit.org/show_bug.cgi?id=183550
+
+ Reviewed by Zalan Bujtas.
+
+ Fixes a typo in a header import, as well as a nullability error. `SecTrustEvaluate()` takes in a nonnull outparam,
+ which was removed in r229512; this adds the outparam back, but does not consult its value when setting the
+ `infoDictionary`.
+
+ * UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:
+ (-[WKFullScreenWindowController _EVOrganizationName]):
+
2018-03-10 Jer Noble <jer.no...@apple.com>
Improvements to fullscreen; new UI and security features
Modified: trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm (229520 => 229521)
--- trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm 2018-03-12 03:25:39 UTC (rev 229520)
+++ trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm 2018-03-12 03:38:22 UTC (rev 229521)
@@ -29,8 +29,8 @@
#import "WKFullScreenWindowControllerIOS.h"
#import "UIKitSPI.h"
+#import "WKFullScreenViewController.h"
#import "WKFullscreenStackView.h"
-#import "WKFullscreenViewController.h"
#import "WKWebView.h"
#import "WKWebViewInternal.h"
#import "WKWebViewPrivate.h"
@@ -768,7 +768,8 @@
// If SecTrustCopyInfo returned NULL then it's likely that the SecTrustRef has not been evaluated
// and the only way to get the information we need is to call SecTrustEvaluate ourselves.
if (!infoDictionary) {
- OSStatus err = SecTrustEvaluate(trust, NULL);
+ SecTrustResultType result = kSecTrustResultProceed;
+ OSStatus err = SecTrustEvaluate(trust, &result);
if (err == noErr)
infoDictionary = [(__bridge NSDictionary *)SecTrustCopyInfo(trust) autorelease];
if (!infoDictionary)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
