Title: [249068] trunk/Source
- Revision
- 249068
- Author
- [email protected]
- Date
- 2019-08-23 14:21:51 -0700 (Fri, 23 Aug 2019)
Log 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+.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (249067 => 249068)
--- trunk/Source/WTF/ChangeLog 2019-08-23 21:06:02 UTC (rev 249067)
+++ trunk/Source/WTF/ChangeLog 2019-08-23 21:21:51 UTC (rev 249068)
@@ -1,3 +1,10 @@
+2019-08-23 Jiewen Tan <[email protected]>
+
+ Unreviewed, build fix after r249059
+
+ * wtf/Platform.h:
+ Make HAVE_NEAR_FIELD available only on iOS 13+ and macOS Catalina+.
+
2019-08-23 Chris Dumez <[email protected]>
Regression(r248533) Assertion hit in isMainThread() for some clients using WTF because the main thread is not initialized
Modified: trunk/Source/WTF/wtf/Platform.h (249067 => 249068)
--- trunk/Source/WTF/wtf/Platform.h 2019-08-23 21:06:02 UTC (rev 249067)
+++ trunk/Source/WTF/wtf/Platform.h 2019-08-23 21:21:51 UTC (rev 249068)
@@ -1642,10 +1642,6 @@
#define HAVE_DATA_PROTECTION_KEYCHAIN 1
#endif
-#if !PLATFORM(IOS_FAMILY_SIMULATOR)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
#define HAVE_NEAR_FIELD 1
#endif
-
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
-#define HAVE_NF_READER_SESSION_UPDATE_UI_ALERT_MESSAGE 1
-#endif
Modified: trunk/Source/WebKit/ChangeLog (249067 => 249068)
--- trunk/Source/WebKit/ChangeLog 2019-08-23 21:06:02 UTC (rev 249067)
+++ trunk/Source/WebKit/ChangeLog 2019-08-23 21:21:51 UTC (rev 249068)
@@ -1,3 +1,11 @@
+2019-08-23 Jiewen Tan <[email protected]>
+
+ Unreviewed, build fix after r249059
+
+ * UIProcess/WebAuthentication/Cocoa/NfcConnection.mm:
+ (WebKit::NfcConnection::NfcConnection):
+ Remove the HAVE() macro.
+
2019-08-23 Chris Dumez <[email protected]>
[geolocation] Rename interfaces and remove [NoInterfaceObject]
Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/NfcConnection.mm (249067 => 249068)
--- trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/NfcConnection.mm 2019-08-23 21:06:02 UTC (rev 249067)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/NfcConnection.mm 2019-08-23 21:21:51 UTC (rev 249068)
@@ -52,9 +52,7 @@
{
[m_session setDelegate:m_delegate.get()];
// FIXME(200933)
-#if HAVE(NF_READER_SESSION_UPDATE_UI_ALERT_MESSAGE)
[m_session updateUIAlertMessage:@"Hold the key against the top of your device."];
-#endif
[m_session startPolling];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
