Changeset 229521 in webkit


Ignore:
Timestamp:
Mar 11, 2018 8:38:22 PM (6 years ago)
Author:
Wenson Hsieh
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]):

Location:
trunk/Source/WebKit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/ChangeLog

    r229512 r229521  
     12018-03-11  Wenson Hsieh  <wenson_hsieh@apple.com>
     2
     3        Fix the internal iOS build after r229512
     4        https://bugs.webkit.org/show_bug.cgi?id=183550
     5
     6        Reviewed by Zalan Bujtas.
     7
     8        Fixes a typo in a header import, as well as a nullability error. `SecTrustEvaluate()` takes in a nonnull outparam,
     9        which was removed in r229512; this adds the outparam back, but does not consult its value when setting the
     10        `infoDictionary`.
     11
     12        * UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:
     13        (-[WKFullScreenWindowController _EVOrganizationName]):
     14
    1152018-03-10  Jer Noble  <jer.noble@apple.com>
    216
  • trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm

    r229512 r229521  
    3030
    3131#import "UIKitSPI.h"
     32#import "WKFullScreenViewController.h"
    3233#import "WKFullscreenStackView.h"
    33 #import "WKFullscreenViewController.h"
    3434#import "WKWebView.h"
    3535#import "WKWebViewInternal.h"
     
    769769    // and the only way to get the information we need is to call SecTrustEvaluate ourselves.
    770770    if (!infoDictionary) {
    771         OSStatus err = SecTrustEvaluate(trust, NULL);
     771        SecTrustResultType result = kSecTrustResultProceed;
     772        OSStatus err = SecTrustEvaluate(trust, &result);
    772773        if (err == noErr)
    773774            infoDictionary = [(__bridge NSDictionary *)SecTrustCopyInfo(trust) autorelease];
Note: See TracChangeset for help on using the changeset viewer.