Changeset 230122 in webkit

Timestamp:

Mar 30, 2018 5:12:36 PM (6 years ago)

Author:

Wenson Hsieh

Message:

[Extra zoom mode] Adopt list view controller UI for numeric input types
​https://bugs.webkit.org/show_bug.cgi?id=184184
<rdar://problem/37238916>

Reviewed by Timothy Hatcher.

Source/WebCore:

Add a localized string for the OK button shown on number pads in extra zoomed form controls.

• English.lproj/Localizable.strings:
• platform/LocalizedStrings.cpp:

(WebCore::numberPadOKButtonTitle):

• platform/LocalizedStrings.h:

Source/WebKit:

Remove existing logic for presenting a number pad view controller, since number pads will now be handled as a
special case of general text form controls in extra zoom mode.

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

(-[WKContentView presentViewControllerForCurrentAssistedNode]):
(-[WKContentView dismissAllInputViewControllers]):
(-[WKContentView _wheelChangedWithEvent:]):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/English.lproj/Localizable.strings (modified) (2 diffs)
• WebCore/platform/LocalizedStrings.cpp (modified) (1 diff)
• WebCore/platform/LocalizedStrings.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/ios/WKContentViewInteraction.h (modified) (2 diffs)
• WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-03-30  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [Extra zoom mode] Adopt list view controller UI for numeric input types
+        https://bugs.webkit.org/show_bug.cgi?id=184184
+        <rdar://problem/37238916>
+
+        Reviewed by Timothy Hatcher.
+
+        Add a localized string for the OK button shown on number pads in extra zoomed form controls.
+
+        * English.lproj/Localizable.strings:
+        * platform/LocalizedStrings.cpp:
+        (WebCore::numberPadOKButtonTitle):
+        * platform/LocalizedStrings.h:
+
 2018-03-30  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/English.lproj/Localizable.strings

@@ -440 +440 @@
 "Numbered list" = "Numbered list";
 
+/* Title of the OK button for the number pad in zoomed form controls. */
+"OK (OK button title in extra zoomed number pad)" = "OK";
+
 /* OK button label in document password failure alert */
 "OK (document password failure alert)" = "OK";
@@ -1205 +1208 @@
 "stop displaying closed captions" = "stop displaying closed captions";
 
+/* Label for the strong password auto fill button inside a text field. */
+"strong password auto fill" = "strong password auto fill";
+
 /* Label for the strong password confirmation auto fill button inside a text field. */
 "strong password confirmation auto fill" = "strong password confirmation auto fill";
 
-/* Label for the strong password auto fill button inside a text field. */
-"strong password auto fill" = "strong password auto fill";
-
 /* The suboptimal value description for a meter element. */
 "suboptimal value" = "suboptimal value";

trunk/Source/WebCore/platform/LocalizedStrings.cpp

@@ -1037 +1037 @@
 #if ENABLE(EXTRA_ZOOM_MODE)
 
+String numberPadOKButtonTitle()
+{
+    return WEB_UI_STRING_KEY("OK", "OK (OK button title in extra zoomed number pad)", "Title of the OK button for the number pad in zoomed form controls.");
+}
+
 String formControlDoneButtonTitle()
 {

trunk/Source/WebCore/platform/LocalizedStrings.h

@@ -318 +318 @@
 
 #if ENABLE(EXTRA_ZOOM_MODE)
+    WEBCORE_EXPORT String numberPadOKButtonTitle();
     WEBCORE_EXPORT String formControlCancelButtonTitle();
     WEBCORE_EXPORT String formControlDoneButtonTitle();

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-03-30  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [Extra zoom mode] Adopt list view controller UI for numeric input types
+        https://bugs.webkit.org/show_bug.cgi?id=184184
+        <rdar://problem/37238916>
+
+        Reviewed by Timothy Hatcher.
+
+        Remove existing logic for presenting a number pad view controller, since number pads will now be handled as a
+        special case of general text form controls in extra zoom mode.
+
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView presentViewControllerForCurrentAssistedNode]):
+        (-[WKContentView dismissAllInputViewControllers]):
+        (-[WKContentView _wheelChangedWithEvent:]):
+
 2018-03-30  Dan Bernstein  <mitz@apple.com>
 

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

@@ -87 +87 @@
 @class WKDatePickerViewController;
 @class WKFocusedFormControlViewController;
-@class WKNumberPadViewController;
 @class WKSelectMenuListViewController;
 @class WKTextInputListViewController;
@@ -256 +255 @@
     RetainPtr<WKTextInputListViewController> _textInputListViewController;
     RetainPtr<WKFocusedFormControlViewController> _focusedFormControlViewController;
-    RetainPtr<WKNumberPadViewController> _numberPadViewController;
     RetainPtr<WKSelectMenuListViewController> _selectMenuListViewController;
     RetainPtr<WKTimePickerViewController> _timePickerViewController;

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

@@ -50 +50 @@
 #import "WKInspectorNodeSearchGestureRecognizer.h"
 #import "WKNSURLExtras.h"
-#import "WKNumberPadViewController.h"
 #import "WKPreviewActionItemIdentifiers.h"
 #import "WKPreviewActionItemInternal.h"
@@ -4223 +4222 @@
 
     switch (_assistedNodeInformation.elementType) {
-    case InputType::Number:
-    case InputType::NumberPad:
-    case InputType::Phone:
-        if (!_numberPadViewController) {
-            _numberPadViewController = adoptNS([[WKNumberPadViewController alloc] initWithText:_assistedNodeInformation.value textSuggestions:@[]]);
-            [_numberPadViewController setDelegate:self];
-            [_focusedFormControlViewController presentViewController:_numberPadViewController.get() animated:YES completion:nil];
-        }
-        break;
     case InputType::Select:
         if (!_selectMenuListViewController) {
@@ -4269 +4259 @@
         [controller dismissViewControllerAnimated:YES completion:nil];
 
-    if (auto controller = WTFMove(_numberPadViewController))
-        [controller dismissViewControllerAnimated:YES completion:nil];
-
     if (auto controller = WTFMove(_selectMenuListViewController))
         [controller dismissViewControllerAnimated:YES completion:nil];
@@ -4475 +4462 @@
 {
 #if ENABLE(EXTRA_ZOOM_MODE)
-    if ([_numberPadViewController handleWheelEvent:event])
-        return;
-
     if ([_timePickerViewController handleWheelEvent:event])
         return;