Update dismiss-picker-using-keyboard.html test to work on iPad correctly

[Megan Gardner]

Update dismiss-picker-using-keyboard.html to work on iPad correctly

[Megan Gardner]

Created attachment 383659 [details]
Patch

[Megan Gardner]

<rdar://problem/57239690>

[Wenson Hsieh]

Comment on attachment 383659 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=383659&action=review

> LayoutTests/resources/ui-helper.js:367
> -                    uiController.didShowKeyboardCallback = function() {
> +                    function clearCallbacksAndScriptComplete() {
> +                        uiController.didShowKeyboardCallback = null;
> +                        uiController.willPresentPopoverCallback = null;
>                          uiController.uiScriptComplete();
> -                    };
> +                    }
> +                }
> +                (function() {
> +                    uiController.didShowKeyboardCallback = clearCallbacksAndScriptComplete;
> +                    uiController.willPresentPopoverCallback = clearCallbacksAndScriptComplete;
>                      uiController.singleTapAtPoint(${x}, ${y}, function() { });
>                  })()`, resolve);

It looks like there's an extra open parenthesis at the beginning of this script. clearCallbacksAndScriptComplete is also scoped to its anonymous function (which is also never invoked), so uiController.didShowKeyboardCallback and uiController.willPresentPopoverCallback won't get set to it. I think you meant to define clearCallbacksAndScriptComplete inside the second anonymous function?

> LayoutTests/resources/ui-helper.js:374
> +        if (!this.isWebKit2() || !this.isIOSFamily())
> +            return this.activateAt(x, y);

I don't think you meant to put this here.

> LayoutTests/resources/ui-helper.js:381
> +                        uiController.waitForKeyboardToHide = null;
> +                        uiController.waitForPopoverToDismiss = null;

Same comments as above.

waitForKeyboardToHide and waitForPopoverToDismiss also don't seem to be attributes on UIScriptController.

> LayoutTests/resources/ui-helper.js:387
> +                    uiController.waitForKeyboardToHide = clearCallbacksAndScriptComplete;
> +                    uiController.waitForPopoverToDismiss = clearCallbacksAndScriptComplete;

Ditto.

[Megan Gardner]

Created attachment 383781 [details]
Patch

[Wenson Hsieh]

Comment on attachment 383781 [details]
Patch

r=mews

[Simon Fraser (smfr)]

Comment on attachment 383781 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=383781&action=review

> LayoutTests/resources/ui-helper.js:366
> -                    uiController.didShowKeyboardCallback = function() {
> +                    function clearCallbacksAndScriptComplete() {
> +                        uiController.didShowKeyboardCallback = null;
> +                        uiController.willPresentPopoverCallback = null;
>                          uiController.uiScriptComplete();
> -                    };
> +                    }
> +                    uiController.didShowKeyboardCallback = clearCallbacksAndScriptComplete;
> +                    uiController.willPresentPopoverCallback = clearCallbacksAndScriptComplete;
>                      uiController.singleTapAtPoint(${x}, ${y}, function() { });
>                  })()`, resolve);
>          });

This looks the same as waitForInputSessionToDismiss() so can you just call that here?

[WebKit Commit Bot]

Comment on attachment 383781 [details]
Patch

Clearing flags on attachment: 383781

Committed r252608: <https://trac.webkit.org/changeset/252608>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.