Title: [228976] trunk/Tools
- Revision
- 228976
- Author
- wenson_hs...@apple.com
- Date
- 2018-02-24 15:30:16 -0800 (Sat, 24 Feb 2018)
Log Message
Unreviewed, fix the TestWebKitAPI build after r228825.
I removed a `>= iOS 11` check in r228825, but forgot that this was also neeed to guard against tvOS and watchOS
builds. This fixes the build by restoring the compile-time guard and also makes it explicit for these platforms.
* TestWebKitAPI/Tests/ios/ActionSheetTests.mm:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (228975 => 228976)
--- trunk/Tools/ChangeLog 2018-02-24 22:06:39 UTC (rev 228975)
+++ trunk/Tools/ChangeLog 2018-02-24 23:30:16 UTC (rev 228976)
@@ -1,3 +1,12 @@
+2018-02-24 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Unreviewed, fix the TestWebKitAPI build after r228825.
+
+ I removed a `>= iOS 11` check in r228825, but forgot that this was also neeed to guard against tvOS and watchOS
+ builds. This fixes the build by restoring the compile-time guard and also makes it explicit for these platforms.
+
+ * TestWebKitAPI/Tests/ios/ActionSheetTests.mm:
+
2018-02-22 Yusuke Suzuki <utatane....@gmail.com>
Remove currentTime() / currentTimeMS()
Modified: trunk/Tools/TestWebKitAPI/Tests/ios/ActionSheetTests.mm (228975 => 228976)
--- trunk/Tools/TestWebKitAPI/Tests/ios/ActionSheetTests.mm 2018-02-24 22:06:39 UTC (rev 228975)
+++ trunk/Tools/TestWebKitAPI/Tests/ios/ActionSheetTests.mm 2018-02-24 23:30:16 UTC (rev 228976)
@@ -140,6 +140,8 @@
EXPECT_TRUE(runTest(@"０８０８０８０８０８０"));
}
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+
static void presentActionSheetAndChooseAction(WKWebView *webView, ActionSheetObserver *observer, CGPoint location, _WKElementActionType actionType)
{
__block RetainPtr<_WKElementAction> copyAction;
@@ -294,6 +296,8 @@
EXPECT_WK_STREQ("", [webView stringByEvaluatingJavaScript:@"rawHTMLData.textContent"]);
}
+#endif // !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+
} // namespace TestWebKitAPI
#endif // PLATFORM(IOS)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
