Title: [263224] trunk/Tools
- Revision
- 263224
- Author
- aes...@apple.com
- Date
- 2020-06-18 13:07:22 -0700 (Thu, 18 Jun 2020)
Log Message
Unreviewed build fix after r263194
* WebKitTestRunner/ios/TestControllerIOS.mm:
(WTR::TestController::platformResetStateToConsistentValues): Guarded code that mentions
UIContextMenuInteraction with USE(UICONTEXTMENU).
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (263223 => 263224)
--- trunk/Tools/ChangeLog 2020-06-18 20:06:11 UTC (rev 263223)
+++ trunk/Tools/ChangeLog 2020-06-18 20:07:22 UTC (rev 263224)
@@ -1,3 +1,11 @@
+2020-06-18 Andy Estes <aes...@apple.com>
+
+ Unreviewed build fix after r263194
+
+ * WebKitTestRunner/ios/TestControllerIOS.mm:
+ (WTR::TestController::platformResetStateToConsistentValues): Guarded code that mentions
+ UIContextMenuInteraction with USE(UICONTEXTMENU).
+
2020-06-18 Ryan Haddad <ryanhad...@apple.com>
Unreviewed infrastructure fix, temporarily remove ews116 due to hardware failure tracked with rdar://64424245
Modified: trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm (263223 => 263224)
--- trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2020-06-18 20:06:11 UTC (rev 263223)
+++ trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2020-06-18 20:07:22 UTC (rev 263224)
@@ -177,7 +177,9 @@
m_presentPopoverSwizzlers.clear();
if (!options.shouldPresentPopovers) {
+#if USE(UICONTEXTMENU)
m_presentPopoverSwizzlers.append(makeUnique<InstanceMethodSwizzler>([UIContextMenuInteraction class], @selector(_presentMenuAtLocation:), reinterpret_cast<IMP>(overridePresentMenuOrPopoverOrViewController)));
+#endif
m_presentPopoverSwizzlers.append(makeUnique<InstanceMethodSwizzler>([UIPopoverController class], @selector(presentPopoverFromRect:inView:permittedArrowDirections:animated:), reinterpret_cast<IMP>(overridePresentMenuOrPopoverOrViewController)));
m_presentPopoverSwizzlers.append(makeUnique<InstanceMethodSwizzler>([UIViewController class], @selector(presentViewController:animated:completion:), reinterpret_cast<IMP>(overridePresentMenuOrPopoverOrViewController)));
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
