Changeset 237331 in webkit

Timestamp:

Oct 22, 2018 2:22:36 PM (6 years ago)

Author:

timothy_horton@apple.com

Message:

Don't waste time under -setupInteraction under -initWithFrame for unparented WKWebViews
​https://bugs.webkit.org/show_bug.cgi?id=190801
<rdar://problem/43674361>

Reviewed by Megan Gardner.

• UIProcess/ios/WKContentView.mm:

(-[WKContentView _commonInitializationWithProcessPool:configuration:]):
(-[WKContentView didMoveToWindow]):
Defer the first call to WKContentViewInteraction's -setupInteraction
until the view is parented. This avoids a few milliseconds of unnecessary
work for views that are never parented.

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

(-[WKContentView setupInteraction]):
(-[WKContentView cleanupInteraction]):
Keep track of the current state of WKContentViewInteraction's gestures.
Use this to make it OK to call -setupInteraction multiple times.

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-10-22  Tim Horton  <timothy_horton@apple.com>
+
+        Don't waste time under -setupInteraction under -initWithFrame for unparented WKWebViews
+        https://bugs.webkit.org/show_bug.cgi?id=190801
+        <rdar://problem/43674361>
+
+        Reviewed by Megan Gardner.
+
+        * UIProcess/ios/WKContentView.mm:
+        (-[WKContentView _commonInitializationWithProcessPool:configuration:]):
+        (-[WKContentView didMoveToWindow]):
+        Defer the first call to WKContentViewInteraction's -setupInteraction
+        until the view is parented. This avoids a few milliseconds of unnecessary
+        work for views that are never parented.
+
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView setupInteraction]):
+        (-[WKContentView cleanupInteraction]):
+        Keep track of the current state of WKContentViewInteraction's gestures.
+        Use this to make it OK to call -setupInteraction multiple times.
+
 2018-10-22  Chris Dumez  <cdumez@apple.com>
 

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

@@ -219 +219 @@
     [_fixedClippingView addSubview:_rootContentView.get()];
 
-    [self setupInteraction];
     [self setUserInteractionEnabled:YES];
 
@@ -276 +275 @@
         [self _updateForScreen:newWindow.screen];
     }
+}
+
+- (void)didMoveToWindow
+{
+    [super didMoveToWindow];
+
+    if (self.window)
+        [self setupInteraction];
 }
 

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

@@ -278 +278 @@
     BOOL _focusRequiresStrongPasswordAssistance;
 
+    BOOL _hasSetUpInteractions;
+
 #if ENABLE(DATA_INTERACTION)
     WebKit::DragDropInteractionState _dragDropInteractionState;

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

@@ -626 +626 @@
 - (void)setupInteraction
 {
+    if (_hasSetUpInteractions)
+        return;
+
     if (!_interactionViewsContainerView) {
         _interactionViewsContainerView = adoptNS([[UIView alloc] init]);
@@ -714 +717 @@
     _dataListTextSuggestions = nil;
 #endif
+
+    _hasSetUpInteractions = YES;
 }
 
 - (void)cleanupInteraction
 {
+    if (!_hasSetUpInteractions)
+        return;
+
     _webSelectionAssistant = nil;
     _textSelectionAssistant = nil;
@@ -814 +822 @@
     _dataListTextSuggestions = nil;
 #endif
+
+    _hasSetUpInteractions = NO;
 }