Changeset 237924 in webkit

Timestamp:

Nov 7, 2018 6:57:40 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Source/WebKit:
Force a gregorian calendar to show for credit card expiration date inputs
(autocomplete='cc-exp'*) regardless of default system settings.
​https://bugs.webkit.org/show_bug.cgi?id=191096
rdar://problem/42640256

Patch by Zamiul Haque <​zhaque@apple.com> on 2018-11-07
Reviewed by Tim Horton.

Added some plumbing code to expose the calendar identifier of the calendar used by a
presented date picker. Added shouldPresentGregorianCalendar:, to be used for
determining what property values a date input control must present a Gregorian
calendar for.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView formInputPeripheral]):

• UIProcess/ios/forms/WKFormInputControl.mm:

Tools:
Force a gregorian calendar to show for credit card expiration date inputs
(autocomplete='cc-exp'*) regardless of default system settings.
​https://bugs.webkit.org/show_bug.cgi?id=191096
rdar://problem/42640256

Patch by Zamiul Haque <​zhaque@apple.com> on 2018-11-07
Reviewed by Tim Horton.

Implemented simulateForeignDefaultCalendar and calendarType to be used
for changing the default calendar returned by the system (ie. [NSCalendar
currentCalendar]) and getting the calendar type identifier of a presented date
picker.

• DumpRenderTree/ios/UIScriptControllerIOS.mm:

(WTR::UIScriptController::isShowingDataListSuggestions const):
(WTR::UIScriptController::calendarType const):
(WTR::UIScriptController::setDefaultCalendarType):

• DumpRenderTree/mac/UIScriptControllerMac.mm:

(WTR::UIScriptController::calendarType const):
(WTR::UIScriptController::setDefaultCalendarType):

• TestRunnerShared/UIScriptContext/UIScriptController.cpp:

(WTR::UIScriptController::selectionEndGrabberViewRect const):
(WTR::UIScriptController::calendarType const): Deleted.

• WebKitTestRunner/TestController.cpp:
• WebKitTestRunner/TestController.h:
• WebKitTestRunner/UIScriptControllerCocoa.mm:

(WTR::UIScriptController::calendarType const):

• WebKitTestRunner/cocoa/TestControllerCocoa.mm:

(WTR::swizzledCalendar):
(WTR::TestController::getOverriddenCalendarIdentifier const):
(WTR::TestController::setDefaultCalendarType):
(WTR::TestController::cocoaResetStateToConsistentValues):

• WebKitTestRunner/ios/UIScriptControllerIOS.mm:

(WTR::UIScriptController::selectionEndGrabberViewRect const):
(WTR::UIScriptController::calendarType const): Deleted.

LayoutTests:
Created a layout test to ensure that date controls marked as credit card expiry
fields present a Gregorian calendar regardless of default system settings.
​https://bugs.webkit.org/show_bug.cgi?id=191096
rdar://problem/42640256

Patch by Zamiul Haque <​zhaque@apple.com> on 2018-11-07
Reviewed by Tim Horton.

Added two new methods to UIHelper, helping to facilitate this. calendarType
returns the calendar identifier of the NSCalendar instance used by the presented
date picker and setDefaultCalendarType accepts a calendar identifier as an
argument for changing the default system settings.

• fast/forms/ios/force-gregorian-calendar-for-credit-card-expiry.html:
• platform/win/TestExpectations:
• resources/ui-helper.js:

(window.UIHelper.calendarType):
(window.UIHelper.setDefaultCalendarType):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/ios/force-gregorian-calendar-for-credit-card-expiry-expected.txt (added)
• LayoutTests/fast/forms/ios/force-gregorian-calendar-for-credit-card-expiry.html (added)
• LayoutTests/resources/ui-helper.js (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (modified) (2 diffs)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)
• Source/WebKit/UIProcess/ios/forms/WKFormInputControl.h (modified) (1 diff)
• Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm (modified) (5 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm (modified) (1 diff)
• Tools/DumpRenderTree/mac/UIScriptControllerMac.mm (modified) (1 diff)
• Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl (modified) (2 diffs)
• Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp (modified) (1 diff)
• Tools/TestRunnerShared/UIScriptContext/UIScriptController.h (modified) (1 diff)
• Tools/WebKitTestRunner/TestController.h (modified) (4 diffs)
• Tools/WebKitTestRunner/UIScriptControllerCocoa.mm (modified) (1 diff)
• Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-11-07  Zamiul Haque  <zhaque@apple.com>
+
+        Created a layout test to ensure that date controls marked as credit card expiry
+        fields present a Gregorian calendar regardless of default system settings. 
+        https://bugs.webkit.org/show_bug.cgi?id=191096
+        rdar://problem/42640256
+
+        Reviewed by Tim Horton.
+
+        Added two new methods to UIHelper, helping to facilitate this. calendarType
+        returns the calendar identifier of the NSCalendar instance used by the presented
+        date picker and setDefaultCalendarType accepts a calendar identifier as an
+        argument for changing the default system settings.
+
+        * fast/forms/ios/force-gregorian-calendar-for-credit-card-expiry.html:
+        * platform/win/TestExpectations:
+        * resources/ui-helper.js:
+        (window.UIHelper.calendarType):
+        (window.UIHelper.setDefaultCalendarType):
+
 2018-11-07  Tadeu Zagallo  <tzagallo@apple.com>
 

trunk/LayoutTests/resources/ui-helper.js

@@ -347 +347 @@
     }
 
+    static calendarType()
+    {
+        if (!this.isWebKit2())
+            return Promise.resolve();
+
+        return new Promise(resolve => {
+            testRunner.runUIScript(`(() => {
+                uiController.doAfterNextStablePresentationUpdate(() => {
+                    uiController.uiScriptComplete(JSON.stringify(uiController.calendarType));
+                })
+            })()`, jsonString => {
+                resolve(JSON.parse(jsonString));
+            });
+        });
+    }
+
+    static setDefaultCalendarType(calendarIdentifier)
+    {
+        if (!this.isWebKit2())
+            return Promise.resolve();
+
+        return new Promise(resolve => testRunner.runUIScript(`uiController.setDefaultCalendarType('${calendarIdentifier}')`, resolve));
+
+    }
+
     static setViewScale(scale)
     {

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-11-07  Zamiul Haque  <zhaque@apple.com>
+
+        Force a gregorian calendar to show for credit card expiration date inputs
+        (autocomplete='cc-exp'*) regardless of default system settings.
+        https://bugs.webkit.org/show_bug.cgi?id=191096
+        rdar://problem/42640256
+
+        Reviewed by Tim Horton.
+
+        Added some plumbing code to expose the calendar identifier of the calendar used by a
+        presented date picker. Added shouldPresentGregorianCalendar:, to be used for
+        determining what property values a date input control must present a Gregorian
+        calendar for.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView formInputPeripheral]):
+        * UIProcess/ios/forms/WKFormInputControl.mm:
+
 2018-11-07  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -93 +93 @@
 @class WKActionSheetAssistant;
 @class WKFocusedFormControlView;
+@class WKFormInputControl;
 @class WKFormInputSession;
 @class WKInspectorNodeSearchGestureRecognizer;
@@ -423 +424 @@
 @property (nonatomic, readonly) NSString *selectFormPopoverTitle;
 @property (nonatomic, readonly) NSString *formInputLabel;
+@property (nonatomic, readonly) WKFormInputControl *formInputControl;
 
 @end

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

@@ -5962 +5962 @@
 @implementation WKContentView (WKTesting)
 
+- (WKFormInputControl *)formInputControl
+{
+    if ([_inputPeripheral isKindOfClass:WKFormInputControl.class])
+        return (WKFormInputControl *)_inputPeripheral.get();
+    return nil;
+}
+
 - (void)_simulateTextEntered:(NSString *)text
 {

trunk/Source/WebKit/UIProcess/ios/forms/WKFormInputControl.h

@@ -34 +34 @@
 @end
 
+@interface WKFormInputControl (WKTesting)
+@property (nonatomic, readonly) NSString *dateTimePickerCalendarType;
+@end
+
 #endif // PLATFORM(IOS_FAMILY)

trunk/Source/WebKit/UIProcess/ios/forms/WKFormInputControl.mm

@@ -48 +48 @@
 @end
 
+@interface WKDateTimePopover : WKFormRotatingAccessoryPopover<WKFormControl> {
+    RetainPtr<WKDateTimePopoverViewController> _viewController;
+    WKContentView *_view;
+}
+- (id)initWithView:(WKContentView *)view datePickerMode:(UIDatePickerMode)mode;
+- (WKDateTimePopoverViewController *)viewController;
+@end
+
 @interface WKDateTimePicker : NSObject<WKFormControl> {
     RetainPtr<UIDatePicker> _datePicker;
@@ -57 +65 @@
 - (id)initWithView:(WKContentView *)view datePickerMode:(UIDatePickerMode)mode;
 - (UIDatePicker *)datePicker;
-@end
-
-@interface WKDateTimePopover : WKFormRotatingAccessoryPopover<WKFormControl> {
-    RetainPtr<WKDateTimePopoverViewController> _viewController;
-    WKContentView* _view;
-}
-- (id)initWithView:(WKContentView *)view datePickerMode:(UIDatePickerMode)mode;
-- (WKDateTimePopoverViewController *) viewController;
+
 @end
 
@@ -110 +111 @@
     _datePicker.get().datePickerMode = mode;
     _datePicker.get().hidden = NO;
+    
+    if ([self shouldPresentGregorianCalendar:view.assistedNodeInformation])
+        _datePicker.get().calendar = [NSCalendar calendarWithIdentifier:NSCalendarIdentifierGregorian];
+    
     [_datePicker addTarget:self action:@selector(_dateChangeHandler:) forControlEvents:UIControlEventValueChanged];
 
     return self;
+}
+
+- (NSString *)calendarType
+{
+    return _datePicker.get().calendar.calendarIdentifier;
 }
 
@@ -119 +129 @@
     [_datePicker removeTarget:self action:NULL forControlEvents:UIControlEventValueChanged];
     [super dealloc];
+}
+
+- (BOOL)shouldPresentGregorianCalendar:(const AssistedNodeInformation&)nodeInfo
+{
+    return nodeInfo.autofillFieldName == WebCore::AutofillFieldName::CcExpMonth
+        || nodeInfo.autofillFieldName == WebCore::AutofillFieldName::CcExp
+        || nodeInfo.autofillFieldName == WebCore::AutofillFieldName::CcExpYear;
 }
 
@@ -281 +298 @@
 @end
 
+@implementation WKFormInputControl (WKTesting)
+- (NSString *)dateTimePickerCalendarType
+{
+    if ([(NSObject *)_control.get() isKindOfClass:WKDateTimePicker.class])
+        return [(WKDateTimePicker *)_control.get() calendarType];
+    return nil;
+}
+@end
 
 @implementation WKDateTimePopoverViewController

trunk/Tools/ChangeLog

@@ +1 @@
+2018-11-07  Zamiul Haque  <zhaque@apple.com>
+
+        Force a gregorian calendar to show for credit card expiration date inputs
+        (autocomplete='cc-exp'*) regardless of default system settings.
+        https://bugs.webkit.org/show_bug.cgi?id=191096
+        rdar://problem/42640256
+
+        Reviewed by Tim Horton.
+
+        Implemented simulateForeignDefaultCalendar and calendarType to be used
+        for changing the default calendar returned by the system (ie. [NSCalendar
+        currentCalendar]) and getting the calendar type identifier of a presented date
+        picker.
+
+        * DumpRenderTree/ios/UIScriptControllerIOS.mm:
+        (WTR::UIScriptController::isShowingDataListSuggestions const):
+        (WTR::UIScriptController::calendarType const):
+        (WTR::UIScriptController::setDefaultCalendarType):
+        * DumpRenderTree/mac/UIScriptControllerMac.mm:
+        (WTR::UIScriptController::calendarType const):
+        (WTR::UIScriptController::setDefaultCalendarType):
+        * TestRunnerShared/UIScriptContext/UIScriptController.cpp:
+        (WTR::UIScriptController::selectionEndGrabberViewRect const):
+        (WTR::UIScriptController::calendarType const): Deleted.
+        * WebKitTestRunner/TestController.cpp:
+        * WebKitTestRunner/TestController.h:
+        * WebKitTestRunner/UIScriptControllerCocoa.mm:
+        (WTR::UIScriptController::calendarType const):
+        * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+        (WTR::swizzledCalendar):
+        (WTR::TestController::getOverriddenCalendarIdentifier const):
+        (WTR::TestController::setDefaultCalendarType):
+        (WTR::TestController::cocoaResetStateToConsistentValues):
+        * WebKitTestRunner/ios/UIScriptControllerIOS.mm:
+        (WTR::UIScriptController::selectionEndGrabberViewRect const):
+        (WTR::UIScriptController::calendarType const): Deleted.
+
 2018-11-06  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm

@@ -395 +395 @@
 }
 
+JSObjectRef UIScriptController::calendarType() const
+{
+    return nullptr;
+}
+
+void UIScriptController::setDefaultCalendarType(JSStringRef calendarIdentifier)
+{
+}
+
 void UIScriptController::overridePreference(JSStringRef, JSStringRef)
 {

trunk/Tools/DumpRenderTree/mac/UIScriptControllerMac.mm

@@ -197 +197 @@
 {
 }
-
+    
+JSObjectRef UIScriptController::calendarType() const
+{
+    return nullptr;
+}
+
+void UIScriptController::setDefaultCalendarType(JSStringRef calendarIdentifier)
+{
+}
+    
 }
 

trunk/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl

@@ -23 +23 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
 enum DeviceOrientation {
     "portrait",
@@ -243 +243 @@
     readonly attribute object selectionStartGrabberViewRect;
     readonly attribute object selectionEndGrabberViewRect;
-
+    readonly attribute object calendarType;
+    void setDefaultCalendarType(DOMString calendarIdentifier);
     readonly attribute object inputViewBounds;
 

trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp

@@ -227 +227 @@
     return nullptr;
 }
+    
+void UIScriptController::setDefaultCalendarType(JSStringRef calendarIdentifier)
+{
+}
+
+JSObjectRef UIScriptController::calendarType() const
+{
+    return nullptr;
+}
+    
 #endif
 

trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h

@@ -164 +164 @@
     JSObjectRef selectionStartGrabberViewRect() const;
     JSObjectRef selectionEndGrabberViewRect() const;
+    JSObjectRef calendarType() const;
+    void setDefaultCalendarType(JSStringRef calendarIdentifier);
     JSObjectRef inputViewBounds() const;
 

trunk/Tools/WebKitTestRunner/TestController.h

@@ -34 +34 @@
 #include <vector>
 #include <wtf/HashMap.h>
+#include <wtf/Noncopyable.h>
 #include <wtf/Seconds.h>
 #include <wtf/Vector.h>
 #include <wtf/text/StringHash.h>
 
+#if PLATFORM(COCOA)
+
+#include <objc/runtime.h>
+
+#endif
+
+OBJC_CLASS NSString;
 OBJC_CLASS WKWebViewConfiguration;
 
@@ -48 +56 @@
 struct TestCommand;
 struct TestOptions;
+
+#if PLATFORM(COCOA)
+// FIXME: This should be shared with TestWebKitAPI.
+class ClassMethodSwizzler {
+    WTF_MAKE_NONCOPYABLE(ClassMethodSwizzler);
+public:
+    ClassMethodSwizzler(Class, SEL, IMP);
+    ~ClassMethodSwizzler();
+    
+    Method m_method;
+    IMP m_originalImplementation;
+};
+#endif // PLATFORM(COCOA)
 
 class AsyncTask {
@@ -263 +284 @@
     void toggleCapsLock();
 
+#if PLATFORM(COCOA)
+    RetainPtr<NSString> getOverriddenCalendarIdentifier() const;
+    void setDefaultCalendarType(NSString *identifier);
+#endif // PLATFORM(COCOA)
 private:
     WKRetainPtr<WKPageConfigurationRef> generatePageConfiguration(WKContextConfigurationRef);
@@ -414 +439 @@
 
     std::unique_ptr<TestInvocation> m_currentInvocation;
-
+#if PLATFORM(COCOA)
+    std::unique_ptr<ClassMethodSwizzler> m_calendarSwizzler;
+    RetainPtr<NSString> m_overriddenCalendarIdentifier;
+#endif // PLATFORM(COCOA)
     bool m_verbose { false };
     bool m_printSeparators { false };

trunk/Tools/WebKitTestRunner/UIScriptControllerCocoa.mm

@@ -165 +165 @@
 }
 
+void UIScriptController::setDefaultCalendarType(JSStringRef calendarIdentifier)
+{
+#if WK_API_ENABLED
+    TestController::singleton().setDefaultCalendarType((__bridge NSString *)adoptCF(JSStringCopyCFString(kCFAllocatorDefault, calendarIdentifier)).get());
+#endif
+}
+
+JSObjectRef UIScriptController::calendarType() const
+{
+#if WK_API_ENABLED
+    WKWebView *webView = TestController::singleton().mainWebView()->platformView();
+    UIView *contentView = [webView valueForKeyPath:@"_currentContentView"];
+    NSString *calendarTypeString = [contentView valueForKeyPath:@"formInputControl.dateTimePickerCalendarType"];
+    auto jsContext = m_context->jsContext();
+    return JSValueToObject(jsContext, [JSValue valueWithObject:calendarTypeString inContext:[JSContext contextWithJSGlobalContextRef:jsContext]].JSValueRef, nullptr);
+#else
+    return nullptr;
+#endif
+}
+    
 } // namespace WTR

trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm

@@ -204 +204 @@
 }
 
+ClassMethodSwizzler::ClassMethodSwizzler(Class cls, SEL originalSelector, IMP implementation)
+    : m_method(class_getClassMethod(objc_getMetaClass(NSStringFromClass(cls).UTF8String), originalSelector))
+    , m_originalImplementation(method_setImplementation(m_method, implementation))
+{
+}
+
+ClassMethodSwizzler::~ClassMethodSwizzler()
+{
+    method_setImplementation(m_method, m_originalImplementation);
+}
+    
+static NSCalendar *swizzledCalendar()
+{
+    return [NSCalendar calendarWithIdentifier:TestController::singleton().getOverriddenCalendarIdentifier().get()];
+}
+    
+RetainPtr<NSString> TestController::getOverriddenCalendarIdentifier() const
+{
+    return m_overriddenCalendarIdentifier;
+}
+
+void TestController::setDefaultCalendarType(NSString *identifier)
+{
+    m_overriddenCalendarIdentifier = identifier;
+    if (!m_calendarSwizzler)
+        m_calendarSwizzler = std::make_unique<ClassMethodSwizzler>([NSCalendar class], @selector(currentCalendar), reinterpret_cast<IMP>(swizzledCalendar));
+}
+    
 void TestController::cocoaResetStateToConsistentValues(const TestOptions& options)
 {
@@ -215 +243 @@
 
 
+    m_calendarSwizzler = nullptr;
+    m_overriddenCalendarIdentifier = nil;
+    
     if (auto* webView = mainWebView()) {
         TestRunnerWKWebView *platformView = webView->platformView();