Changeset 249068 in webkit


Ignore:
Timestamp:
Aug 23, 2019 2:21:51 PM (5 years ago)
Author:
jiewen_tan@apple.com
Message:

Unreviewed, build fix after r249059

Source/WebKit:

  • UIProcess/WebAuthentication/Cocoa/NfcConnection.mm:

(WebKit::NfcConnection::NfcConnection):
Remove the HAVE() macro.

Source/WTF:

  • wtf/Platform.h:

Make HAVE_NEAR_FIELD available only on iOS 13+ and macOS Catalina+.

Location:
trunk/Source
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WTF/ChangeLog

    r249064 r249068  
     12019-08-23  Jiewen Tan  <jiewen_tan@apple.com>
     2
     3        Unreviewed, build fix after r249059
     4
     5        * wtf/Platform.h:
     6        Make HAVE_NEAR_FIELD available only on iOS 13+ and macOS Catalina+.
     7
    182019-08-23  Chris Dumez  <cdumez@apple.com>
    29
  • trunk/Source/WTF/wtf/Platform.h

    r249059 r249068  
    16431643#endif
    16441644
    1645 #if !PLATFORM(IOS_FAMILY_SIMULATOR)
     1645#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
    16461646#define HAVE_NEAR_FIELD 1
    16471647#endif
    1648 
    1649 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
    1650 #define HAVE_NF_READER_SESSION_UPDATE_UI_ALERT_MESSAGE 1
    1651 #endif
  • trunk/Source/WebKit/ChangeLog

    r249066 r249068  
     12019-08-23  Jiewen Tan  <jiewen_tan@apple.com>
     2
     3        Unreviewed, build fix after r249059
     4
     5        * UIProcess/WebAuthentication/Cocoa/NfcConnection.mm:
     6        (WebKit::NfcConnection::NfcConnection):
     7        Remove the HAVE() macro.
     8
    192019-08-23  Chris Dumez  <cdumez@apple.com>
    210
  • trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/NfcConnection.mm

    r249059 r249068  
    5353    [m_session setDelegate:m_delegate.get()];
    5454    // FIXME(200933)
    55 #if HAVE(NF_READER_SESSION_UPDATE_UI_ALERT_MESSAGE)
    5655    [m_session updateUIAlertMessage:@"Hold the key against the top of your device."];
    57 #endif
    5856    [m_session startPolling];
    5957}
Note: See TracChangeset for help on using the changeset viewer.