Changeset 271445 in webkit

Timestamp:

Jan 13, 2021, 11:05:44 AM (6 years ago)

Author:

Megan Gardner

Message:

Defer setting up app highlight menus until needed to not delay launch time.
​https://bugs.webkit.org/show_bug.cgi?id=220577
rdar://72940219

Delay adding the app highlight menus to the callout bar until a selection happens,
as the creation of these menus is expensive, and they are only needed if a selection is
made on the page, which is not guaranteed to happen.

Reviewed by Tim Horton.

• UIProcess/ios/WKContentView.mm:

(-[WKContentView _processDidExit]):

• UIProcess/ios/WKContentViewInteraction.h:
• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView setUpInteraction]):
(-[WKContentView _selectionChanged]):
(-[WKContentView setupAppHighlightMenus]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.h (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-13  Megan Gardner  <megan_gardner@apple.com>
+
+        Defer setting up app highlight menus until needed to not delay launch time.
+        https://bugs.webkit.org/show_bug.cgi?id=220577
+        rdar://72940219
+
+        Delay adding the app highlight menus to the callout bar until a selection happens,
+        as the creation of these menus is expensive, and they are only needed if a selection is
+        made on the page, which is not guaranteed to happen.
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/ios/WKContentView.mm:
+        (-[WKContentView _processDidExit]):
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView setUpInteraction]):
+        (-[WKContentView _selectionChanged]):
+        (-[WKContentView setupAppHighlightMenus]):
+
 2021-01-13  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h

@@ -441 +441 @@
 #endif
 
+#if ENABLE(APP_HIGHLIGHTS)
+    BOOL _hasSetUpAppHighlightMenus;
+#endif
+
 #if PLATFORM(WATCHOS)
     RetainPtr<WKFocusedFormControlView> _focusedFormControlView;

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -843 +843 @@
 #endif
 
-#if ENABLE(APP_HIGHLIGHTS)
-    [self setupAppHighlightMenus];
-#endif
-
     _twoFingerSingleTapGestureRecognizer = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_twoFingerSingleTapGestureRecognized:)]);
     [_twoFingerSingleTapGestureRecognizer setAllowableMovement:60];
@@ -6659 +6655 @@
 - (void)_selectionChanged
 {
+#if ENABLE(APP_HIGHLIGHTS)
+    [self setUpAppHighlightMenus];
+#endif
+
     [self _updateSelectionAssistantSuppressionState];
 
@@ -8685 +8685 @@
 
 #if ENABLE(APP_HIGHLIGHTS)
-- (void)setupAppHighlightMenus
-{
+- (void)setUpAppHighlightMenus
+{
+    if (_hasSetUpAppHighlightMenus)
+        return;
+
     if (_page->preferences().appHighlightsEnabled()) {
         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;
     }
 }