Title: [276910] branches/safari-612.1.12-branch/Source/WebKit
- Revision
- 276910
- Author
- [email protected]
- Date
- 2021-05-03 11:14:22 -0700 (Mon, 03 May 2021)
Log Message
Cherry-pick r276826. rdar://problem/77463493
Remove some unneeded code.
https://bugs.webkit.org/show_bug.cgi?id=225216
Reviewed by Wenson Hsieh.
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView setUpAppHighlightMenusIfNeeded]): Deleted.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276826 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.12-branch/Source/WebKit/ChangeLog (276909 => 276910)
--- branches/safari-612.1.12-branch/Source/WebKit/ChangeLog 2021-05-03 18:00:59 UTC (rev 276909)
+++ branches/safari-612.1.12-branch/Source/WebKit/ChangeLog 2021-05-03 18:14:22 UTC (rev 276910)
@@ -1,3 +1,30 @@
+2021-05-03 Ruben Turcios <[email protected]>
+
+ Cherry-pick r276826. rdar://problem/77463493
+
+ Remove some unneeded code.
+ https://bugs.webkit.org/show_bug.cgi?id=225216
+
+ Reviewed by Wenson Hsieh.
+
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView setUpAppHighlightMenusIfNeeded]): Deleted.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276826 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-04-29 Megan Gardner <[email protected]>
+
+ Remove some unneeded code.
+ https://bugs.webkit.org/show_bug.cgi?id=225216
+
+ Reviewed by Wenson Hsieh.
+
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView setUpAppHighlightMenusIfNeeded]): Deleted.
+
2021-05-03 Russell Epstein <[email protected]>
Cherry-pick r276853. rdar://problem/77458363
Modified: branches/safari-612.1.12-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (276909 => 276910)
--- branches/safari-612.1.12-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2021-05-03 18:00:59 UTC (rev 276909)
+++ branches/safari-612.1.12-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2021-05-03 18:14:22 UTC (rev 276910)
@@ -452,10 +452,6 @@
BlockPtr<void()> _actionToPerformAfterReceivingEditDragSnapshot;
#endif
-#if ENABLE(APP_HIGHLIGHTS)
- BOOL _hasSetUpAppHighlightMenus;
-#endif
-
#if HAVE(PEPPER_UI_CORE)
RetainPtr<WKFocusedFormControlView> _focusedFormControlView;
#if HAVE(QUICKBOARD_CONTROLLER)
Modified: branches/safari-612.1.12-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (276909 => 276910)
--- branches/safari-612.1.12-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2021-05-03 18:00:59 UTC (rev 276909)
+++ branches/safari-612.1.12-branch/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2021-05-03 18:14:22 UTC (rev 276910)
@@ -9138,18 +9138,10 @@
}
#endif
-#if ENABLE(APP_HIGHLIGHTS)
-- (void)setUpAppHighlightMenusIfNeeded
-{
- if (_hasSetUpAppHighlightMenus || !_page->preferences().appHighlightsEnabled() || !self.window || !_page->editorState().selectionIsRange)
- return;
- auto addHighlightCurrentGroupItem = adoptNS([[UIMenuItem alloc] initWithTitle:WebCore::contextMenuItemTagAddHighlightToCurrentGroup() action:@selector(createHighlightInCurrentGroupWithRange:)]);
- auto addHighlightNewGroupItem = adoptNS([[UIMenuItem alloc] initWithTitle:WebCore::contextMenuItemTagAddHighlightToNewGroup() action:@selector(createHighlightInNewGroupWithRange:)]);
- [[UIMenuController sharedMenuController] setMenuItems:@[ addHighlightCurrentGroupItem.get(), addHighlightNewGroupItem.get() ]];
- _hasSetUpAppHighlightMenus = YES;
-}
+
+#if ENABLE(APP_HIGHLIGHTS)
- (void)createHighlightInCurrentGroupWithRange:(id)sender
{
_page->createAppHighlightInSelectedRange(WebCore::CreateNewGroupForHighlight::No, WebCore::HighlightRequestOriginatedInApp::No);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
