Changeset 243302 in webkit

Timestamp:

Mar 21, 2019, 11:14:57 AM (7 years ago)

Author:

dbates@webkit.org

Message:

[iOS] Inline -_ensureFormAccessoryView into -formAccessoryView and have -_updateAccessory ensure we have a form accessory
​https://bugs.webkit.org/show_bug.cgi?id=196021

Reviewed by Wenson Hsieh.

Every caller of -_ensureFormAccessoryView, except -formAccessoryView, immediately follows the call
with a call to -_updateAccessory. Let's just have -_updateAccessory ensure we have a form accessory
view and inline the implementation of -_ensureFormAccessoryView into -formAccessoryView so we can
remove one method.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView inputView]): Remove call to -_ensureFormAccessoryView, -_updateAccessory will do
the equivalent work for us.
(-[WKContentView formAccessoryView]): Moved implementation of -_ensureFormAccessoryView into here.
(-[WKContentView _updateAccessory]): Call self.formAccessoryView to ensure we have a form accessory view.
(-[WKContentView _elementDidFocus:userIsInteracting:blurPreviousNode:changingActivityState:userObject:]):
Remove call to -_ensureFormAccessoryView, -_updateAccessory will do
the equivalent work for us.
(-[WKContentView _ensureFormAccessoryView]): Deleted.

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-21  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Inline -_ensureFormAccessoryView into -formAccessoryView and have -_updateAccessory ensure we have a form accessory
+        https://bugs.webkit.org/show_bug.cgi?id=196021
+
+        Reviewed by Wenson Hsieh.
+
+        Every caller of -_ensureFormAccessoryView, except -formAccessoryView, immediately follows the call
+        with a call to -_updateAccessory. Let's just have -_updateAccessory ensure we have a form accessory
+        view and inline the implementation of -_ensureFormAccessoryView into -formAccessoryView so we can
+        remove one method.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView inputView]): Remove call to -_ensureFormAccessoryView, -_updateAccessory will do
+        the equivalent work for us.
+        (-[WKContentView formAccessoryView]): Moved implementation of -_ensureFormAccessoryView into here.
+        (-[WKContentView _updateAccessory]): Call self.formAccessoryView to ensure we have a form accessory view.
+        (-[WKContentView _elementDidFocus:userIsInteracting:blurPreviousNode:changingActivityState:userObject:]):
+        Remove call to -_ensureFormAccessoryView, -_updateAccessory will do
+        the equivalent work for us.
+        (-[WKContentView _ensureFormAccessoryView]): Deleted.
+
 2019-03-21  Shawn Roberts  <sroberts@apple.com>
 

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

@@ -1666 +1666 @@
         // rotation, when a select element is focused. See <https://webkit.org/b/192878> for more information.
         [self _zoomToRevealFocusedElement];
-        [self _ensureFormAccessoryView];
         [self _updateAccessory];
     }
@@ -2475 +2474 @@
 {
     return [super inputAssistantItem];
-}
-
-- (void)_ensureFormAccessoryView
-{
-    if (_formAccessoryView)
-        return;
-
-    _formAccessoryView = adoptNS([[UIWebFormAccessory alloc] initWithInputAssistantItem:self.inputAssistantItem]);
-    [_formAccessoryView setDelegate:self];
 }
 
@@ -3785 +3775 @@
 }
 
+- (UIWebFormAccessory *)formAccessoryView
+{
+    if (_formAccessoryView)
+        return _formAccessoryView.get();
+    _formAccessoryView = adoptNS([[UIWebFormAccessory alloc] initWithInputAssistantItem:self.inputAssistantItem]);
+    [_formAccessoryView setDelegate:self];
+    return _formAccessoryView.get();
+}
+
 - (void)_updateAccessory
 {
-    [_formAccessoryView setNextEnabled:_focusedElementInformation.hasNextNode];
-    [_formAccessoryView setPreviousEnabled:_focusedElementInformation.hasPreviousNode];
+    auto* accessoryView = self.formAccessoryView; // Creates one, if needed.
+
+    [accessoryView setNextEnabled:_focusedElementInformation.hasNextNode];
+    [accessoryView setPreviousEnabled:_focusedElementInformation.hasPreviousNode];
 
     if (currentUserInterfaceIdiomIsPad()) {
-        [_formAccessoryView setClearVisible:NO];
+        [accessoryView setClearVisible:NO];
         return;
     }
@@ -3800 +3801 @@
     case WebKit::InputType::DateTimeLocal:
     case WebKit::InputType::Time:
-        [_formAccessoryView setClearVisible:YES];
+        [accessoryView setClearVisible:YES];
         return;
     default:
-        [_formAccessoryView setClearVisible:NO];
+        [accessoryView setClearVisible:NO];
         return;
     }
@@ -4796 +4797 @@
 }
 
-- (UIWebFormAccessory *)formAccessoryView
-{
-    [self _ensureFormAccessoryView];
-    return _formAccessoryView.get();
-}
-
 static bool shouldDeferZoomingToSelectionWhenRevealingFocusedElement(WebKit::InputType type)
 {
@@ -4987 +4982 @@
         [self _zoomToRevealFocusedElement];
 
-    [self _ensureFormAccessoryView];
     [self _updateAccessory];