Title: [261095] trunk/Source
- Revision
- 261095
- Author
- [email protected]
- Date
- 2020-05-04 11:47:34 -0700 (Mon, 04 May 2020)
Log Message
Remove now-unneeded HAVE(MENU_CONTROLLER_SHOW_HIDE_API)
https://bugs.webkit.org/show_bug.cgi?id=211381
Reviewed by Alex Christensen.
Source/WebKit:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _handleDOMPasteRequestWithResult:]): Use hideMenuFromView: directly.
(-[WKContentView _requestDOMPasteAccessWithElementRect:originIdentifier:completionHandler:]):
Use showMenuFromView: directly.
(-[WKContentView showGlobalMenuControllerInRect:]): Deleted.
(-[WKContentView hideGlobalMenuController]): Deleted.
Source/WTF:
* wtf/PlatformHave.h: Remove code to set HAVE_MENU_CONTROLLER_SHOW_HIDE_API.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (261094 => 261095)
--- trunk/Source/WTF/ChangeLog 2020-05-04 18:41:28 UTC (rev 261094)
+++ trunk/Source/WTF/ChangeLog 2020-05-04 18:47:34 UTC (rev 261095)
@@ -1,5 +1,14 @@
2020-05-04 Darin Adler <[email protected]>
+ Remove now-unneeded HAVE(MENU_CONTROLLER_SHOW_HIDE_API)
+ https://bugs.webkit.org/show_bug.cgi?id=211381
+
+ Reviewed by Alex Christensen.
+
+ * wtf/PlatformHave.h: Remove code to set HAVE_MENU_CONTROLLER_SHOW_HIDE_API.
+
+2020-05-04 Darin Adler <[email protected]>
+
Remove now-unneeded HAVE(VOUCHERS)
https://bugs.webkit.org/show_bug.cgi?id=211379
Modified: trunk/Source/WTF/wtf/PlatformHave.h (261094 => 261095)
--- trunk/Source/WTF/wtf/PlatformHave.h 2020-05-04 18:41:28 UTC (rev 261094)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2020-05-04 18:47:34 UTC (rev 261095)
@@ -629,10 +629,6 @@
#define HAVE_AVOBSERVATIONCONTROLLER 1
#endif
-#if PLATFORM(IOS_FAMILY)
-#define HAVE_MENU_CONTROLLER_SHOW_HIDE_API 1
-#endif
-
// FIXME: Should this be enabled on other iOS-family platforms?
#if PLATFORM(IOS) || PLATFORM(MACCATALYST)
#define HAVE_CANCEL_WEB_TOUCH_EVENTS_GESTURE 1
Modified: trunk/Source/WebKit/ChangeLog (261094 => 261095)
--- trunk/Source/WebKit/ChangeLog 2020-05-04 18:41:28 UTC (rev 261094)
+++ trunk/Source/WebKit/ChangeLog 2020-05-04 18:47:34 UTC (rev 261095)
@@ -1,5 +1,19 @@
2020-05-04 Darin Adler <[email protected]>
+ Remove now-unneeded HAVE(MENU_CONTROLLER_SHOW_HIDE_API)
+ https://bugs.webkit.org/show_bug.cgi?id=211381
+
+ Reviewed by Alex Christensen.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _handleDOMPasteRequestWithResult:]): Use hideMenuFromView: directly.
+ (-[WKContentView _requestDOMPasteAccessWithElementRect:originIdentifier:completionHandler:]):
+ Use showMenuFromView: directly.
+ (-[WKContentView showGlobalMenuControllerInRect:]): Deleted.
+ (-[WKContentView hideGlobalMenuController]): Deleted.
+
+2020-05-04 Darin Adler <[email protected]>
+
Remove now-unneeded HAVE(VOUCHERS)
https://bugs.webkit.org/show_bug.cgi?id=211379
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (261094 => 261095)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-05-04 18:41:28 UTC (rev 261094)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2020-05-04 18:47:34 UTC (rev 261095)
@@ -3646,7 +3646,7 @@
_page->grantAccessToCurrentPasteboardData(UIPasteboardNameGeneral);
if (auto pasteHandler = WTFMove(_domPasteRequestHandler)) {
- [self hideGlobalMenuController];
+ [UIMenuController.sharedMenuController hideMenuFromView:self];
pasteHandler(response);
return YES;
}
@@ -6068,31 +6068,6 @@
#endif
}
-- (void)showGlobalMenuControllerInRect:(CGRect)rect
-{
- UIMenuController *controller = UIMenuController.sharedMenuController;
-#if HAVE(MENU_CONTROLLER_SHOW_HIDE_API)
- [controller showMenuFromView:self rect:rect];
-#else
- ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- [controller setTargetRect:rect inView:self];
- [controller setMenuVisible:YES animated:YES];
- ALLOW_DEPRECATED_DECLARATIONS_END
-#endif
-}
-
-- (void)hideGlobalMenuController
-{
- UIMenuController *controller = UIMenuController.sharedMenuController;
-#if HAVE(MENU_CONTROLLER_SHOW_HIDE_API)
- [controller hideMenuFromView:self];
-#else
- ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- [controller setMenuVisible:NO animated:YES];
- ALLOW_DEPRECATED_DECLARATIONS_END
-#endif
-}
-
static BOOL allPasteboardItemOriginsMatchOrigin(UIPasteboard *pasteboard, const String& originIdentifier)
{
if (originIdentifier.isEmpty())
@@ -6140,7 +6115,7 @@
menuControllerRect.inflate(interactionLocationMargin);
}
- [self showGlobalMenuControllerInRect:menuControllerRect];
+ [UIMenuController.sharedMenuController showMenuFromView:self rect:menuControllerRect];
}
- (void)_didUpdateEditorState
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
