204257 2019-11-15 15:34:39 -0800 Update dismiss-picker-using-keyboard.html test to work on iPad correctly 2019-11-18 17:05:23 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner bdakin commit-queue simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1590712 0 megan_gardner 2019-11-15 15:34:39 -0800 Update dismiss-picker-using-keyboard.html to work on iPad correctly 1590726 1 383659 megan_gardner 2019-11-15 16:02:35 -0800 Created attachment 383659 Patch 1590745 2 megan_gardner 2019-11-15 16:37:28 -0800 <rdar://problem/57239690> 1590825 3 383659 wenson_hsieh 2019-11-15 20:53:09 -0800 Comment on attachment 383659 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. 1591206 4 383781 megan_gardner 2019-11-18 13:23:17 -0800 Created attachment 383781 Patch 1591214 5 383781 wenson_hsieh 2019-11-18 13:31:46 -0800 Comment on attachment 383781 Patch r=mews 1591216 6 383781 simon.fraser 2019-11-18 13:38:56 -0800 Comment on attachment 383781 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? 1591332 7 383781 commit-queue 2019-11-18 17:05:22 -0800 Comment on attachment 383781 Patch Clearing flags on attachment: 383781 Committed r252608: <https://trac.webkit.org/changeset/252608> 1591333 8 commit-queue 2019-11-18 17:05:23 -0800 All reviewed patches have been landed. Closing bug. 383659 2019-11-15 16:02:35 -0800 2019-11-18 13:23:15 -0800 Patch bug-204257-20191115160234.patch text/plain 4204 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyNTA3CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYWYwM2FjYWY1NzVmNzhhMjQ4NzUw ZGFmYjRmMWU5ZWFhZjBjMmUwOC4uZWZiNDUyMWNhZWRiNmFmOGEzYTNmYmRmN2ExZjYxYWEyNTVh MTk4YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTExLTE1ICBNZWdhbiBHYXJkbmVyICA8 bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgVXBkYXRlIGRpc21pc3MtcGlja2Vy LXVzaW5nLWtleWJvYXJkLmh0bWwgdGVzdCB0byB3b3JrIG9uIGlQYWQgY29ycmVjdGx5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQyNTcKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzU3MjM5NjkwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoZSBpUGFkIGRvZXMgbm90IHVzZSB0aGUga2V5Ym9hcmQg dG8gc2hvdyB0aGUgb3B0aW9ucyBmb3IgdGhlc2UgZm9ybSBjb250cm9scywKKyAgICAgICAgYW5k IGluc3RlYWQgdXNlcyBhIHBvcG92ZXIuIFRoaXMgZXhwYW5kcyB0aGUgdGVzdCBpbmZyYXN0cnVj dHVyZSB0byBhbGxvdyBmb3IKKyAgICAgICAgZWl0aGVyIGlQaG9uZSBvciBpUGFkIGZ1bmN0aW9u YWxpdHkuIAorCisgICAgICAgICogZmFzdC9mb3Jtcy9pb3MvZGlzbWlzcy1waWNrZXItdXNpbmct a2V5Ym9hcmQuaHRtbDoKKyAgICAgICAgKiByZXNvdXJjZXMvdWktaGVscGVyLmpzOgorICAgICAg ICAod2luZG93LlVJSGVscGVyLmFjdGl2YXRlQW5kV2FpdEZvcklucHV0U2Vzc2lvbkF0LnJldHVy bi5uZXcuUHJvbWlzZS4pOgorICAgICAgICAod2luZG93LlVJSGVscGVyLmFjdGl2YXRlQW5kV2Fp dEZvcklucHV0U2Vzc2lvbkF0LnJldHVybi5uZXcuUHJvbWlzZSk6CisgICAgICAgICh3aW5kb3cu VUlIZWxwZXIud2FpdEZvcklucHV0U2Vzc2lvblRvRGlzbWlzcygpKTogQWRkZWQuCisKIDIwMTkt MTEtMTUgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIExh eW91dCB0ZXN0IGFuaW1hdGlvbnMvbm8tc3R5bGUtcmVjYWxjLWR1cmluZy1hY2NlbGVyYXRlZC1h bmltYXRpb24uaHRtbCBpcyBmYWlsaW5nCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zv cm1zL2lvcy9kaXNtaXNzLXBpY2tlci11c2luZy1rZXlib2FyZC5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9mb3Jtcy9pb3MvZGlzbWlzcy1waWNrZXItdXNpbmcta2V5Ym9hcmQuaHRtbAppbmRleCAy M2ZkMWQ1OGNmZGU5MmY4MDU3MjBkZTQyNWU3ZWY4MDBiNWExYjFkLi5hNTJmZDgxY2MzN2ZhOGQw Yjc1NDkyMWJiNDg0ZmMxMGYzMmE5MzdjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Zv cm1zL2lvcy9kaXNtaXNzLXBpY2tlci11c2luZy1rZXlib2FyZC5odG1sCisrKyBiL0xheW91dFRl c3RzL2Zhc3QvZm9ybXMvaW9zL2Rpc21pc3MtcGlja2VyLXVzaW5nLWtleWJvYXJkLmh0bWwKQEAg LTcwLDcgKzcwLDcgQEAgYXN5bmMgZnVuY3Rpb24gcnVuVGVzdCgpCiAgICAgICAgICAgICBsZXQg ZXhwZWN0ZWRWYWx1ZSA9IGVsZW1lbnRUb1Rlc3QudmFsdWU7CiAgICAgICAgICAgICBhd2FpdCBV SUhlbHBlci5hY3RpdmF0ZUVsZW1lbnRBbmRXYWl0Rm9ySW5wdXRTZXNzaW9uKGVsZW1lbnRUb1Rl c3QpOwogICAgICAgICAgICAgVUlIZWxwZXIua2V5RG93bihrZXlDb21tYW5kLmtleSwga2V5Q29t bWFuZC5tb2RpZmllcnMpOwotICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIud2FpdEZvcktleWJv YXJkVG9IaWRlKCk7CisgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci53YWl0Rm9ySW5wdXRTZXNz aW9uVG9EaXNtaXNzKCk7CiAgICAgICAgICAgICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoImVsZW1l bnRUb1Rlc3QudmFsdWUiLCBleHBlY3RlZFZhbHVlKTsKICAgICAgICAgfQogICAgIH0KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL3Jlc291cmNlcy91aS1oZWxwZXIuanMgYi9MYXlvdXRUZXN0cy9y ZXNvdXJjZXMvdWktaGVscGVyLmpzCmluZGV4IGJmMzNhZWI0MjAyNjA5ODliYzEzNmMyZDM1YmUy MmZhOGU0ZTFhOWEuLjAyYWE0ZGU1MzM0OGUxYWQ4MjY1YjA4Yjc5M2FiN2I4NDAwZTEwNGQgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL3Jlc291cmNlcy91aS1oZWxwZXIuanMKKysrIGIvTGF5b3V0 VGVzdHMvcmVzb3VyY2VzL3VpLWhlbHBlci5qcwpAQCAtMzU0LDE0ICszNTQsNDEgQEAgd2luZG93 LlVJSGVscGVyID0gY2xhc3MgVUlIZWxwZXIgewogICAgICAgICByZXR1cm4gbmV3IFByb21pc2Uo cmVzb2x2ZSA9PiB7CiAgICAgICAgICAgICB0ZXN0UnVubmVyLnJ1blVJU2NyaXB0KGAKICAgICAg ICAgICAgICAgICAoZnVuY3Rpb24oKSB7Ci0gICAgICAgICAgICAgICAgICAgIHVpQ29udHJvbGxl ci5kaWRTaG93S2V5Ym9hcmRDYWxsYmFjayA9IGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAg ICAgICBmdW5jdGlvbiBjbGVhckNhbGxiYWNrc0FuZFNjcmlwdENvbXBsZXRlKCkgeworICAgICAg ICAgICAgICAgICAgICAgICAgdWlDb250cm9sbGVyLmRpZFNob3dLZXlib2FyZENhbGxiYWNrID0g bnVsbDsKKyAgICAgICAgICAgICAgICAgICAgICAgIHVpQ29udHJvbGxlci53aWxsUHJlc2VudFBv cG92ZXJDYWxsYmFjayA9IG51bGw7CiAgICAgICAgICAgICAgICAgICAgICAgICB1aUNvbnRyb2xs ZXIudWlTY3JpcHRDb21wbGV0ZSgpOwotICAgICAgICAgICAgICAgICAgICB9OworICAgICAgICAg ICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIChmdW5jdGlv bigpIHsKKyAgICAgICAgICAgICAgICAgICAgdWlDb250cm9sbGVyLmRpZFNob3dLZXlib2FyZENh bGxiYWNrID0gY2xlYXJDYWxsYmFja3NBbmRTY3JpcHRDb21wbGV0ZTsKKyAgICAgICAgICAgICAg ICAgICAgdWlDb250cm9sbGVyLndpbGxQcmVzZW50UG9wb3ZlckNhbGxiYWNrID0gY2xlYXJDYWxs YmFja3NBbmRTY3JpcHRDb21wbGV0ZTsKICAgICAgICAgICAgICAgICAgICAgdWlDb250cm9sbGVy LnNpbmdsZVRhcEF0UG9pbnQoJHt4fSwgJHt5fSwgZnVuY3Rpb24oKSB7IH0pOwogICAgICAgICAg ICAgICAgIH0pKClgLCByZXNvbHZlKTsKICAgICAgICAgfSk7CiAgICAgfQogCisgICAgc3RhdGlj IHdhaXRGb3JJbnB1dFNlc3Npb25Ub0Rpc21pc3MoKQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlz LmlzV2ViS2l0MigpIHx8ICF0aGlzLmlzSU9TRmFtaWx5KCkpCisgICAgICAgICAgICByZXR1cm4g dGhpcy5hY3RpdmF0ZUF0KHgsIHkpOworCisgICAgICAgIHJldHVybiBuZXcgUHJvbWlzZShyZXNv bHZlID0+IHsKKyAgICAgICAgICAgIHRlc3RSdW5uZXIucnVuVUlTY3JpcHQoYAorICAgICAgICAg ICAgICAgIChmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICAgICAgZnVuY3Rpb24gY2xlYXJD YWxsYmFja3NBbmRTY3JpcHRDb21wbGV0ZSgpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHVp Q29udHJvbGxlci53YWl0Rm9yS2V5Ym9hcmRUb0hpZGUgPSBudWxsOworICAgICAgICAgICAgICAg ICAgICAgICAgdWlDb250cm9sbGVyLndhaXRGb3JQb3BvdmVyVG9EaXNtaXNzID0gbnVsbDsKKyAg ICAgICAgICAgICAgICAgICAgICAgIHVpQ29udHJvbGxlci51aVNjcmlwdENvbXBsZXRlKCk7Cisg ICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAg KGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAgICAgICB1aUNvbnRyb2xsZXIud2FpdEZvcktl eWJvYXJkVG9IaWRlID0gY2xlYXJDYWxsYmFja3NBbmRTY3JpcHRDb21wbGV0ZTsKKyAgICAgICAg ICAgICAgICAgICAgdWlDb250cm9sbGVyLndhaXRGb3JQb3BvdmVyVG9EaXNtaXNzID0gY2xlYXJD YWxsYmFja3NBbmRTY3JpcHRDb21wbGV0ZTsKKyAgICAgICAgICAgICAgICB9KSgpYCwgcmVzb2x2 ZSk7CisgICAgICAgIH0pOworICAgIH0KKwogICAgIHN0YXRpYyBhY3RpdmF0ZUVsZW1lbnRBbmRX YWl0Rm9ySW5wdXRTZXNzaW9uKGVsZW1lbnQpCiAgICAgewogICAgICAgICBjb25zdCB4ID0gZWxl bWVudC5vZmZzZXRMZWZ0ICsgZWxlbWVudC5vZmZzZXRXaWR0aCAvIDI7Cg== 383781 2019-11-18 13:23:17 -0800 2019-11-18 17:05:22 -0800 Patch bug-204257-20191118132316.patch text/plain 4098 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyNTQ2CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNzlkYjZhNzIyYjNiOTk2NjY1MWY3 NmQwYjlkZjY3ZDQyNWQyMDlkMS4uNjNjZjA0ZDNmMDJmMmI5MTE1YjRmNjQ0NzJlOWE3OTYzZmZh NDBlNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE5LTExLTE4ICBNZWdhbiBHYXJkbmVyICA8 bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgVXBkYXRlIGRpc21pc3MtcGlja2Vy LXVzaW5nLWtleWJvYXJkLmh0bWwgdGVzdCB0byB3b3JrIG9uIGlQYWQgY29ycmVjdGx5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQyNTcKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzU3MjM5NjkwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoZSBpUGFkIGRvZXMgbm90IHVzZSB0aGUga2V5Ym9hcmQg dG8gc2hvdyB0aGUgb3B0aW9ucyBmb3IgdGhlc2UgZm9ybSBjb250cm9scywKKyAgICAgICAgYW5k IGluc3RlYWQgdXNlcyBhIHBvcG92ZXIuIFRoaXMgZXhwYW5kcyB0aGUgdGVzdCBpbmZyYXN0cnVj dHVyZSB0byBhbGxvdyBmb3IKKyAgICAgICAgZWl0aGVyIGlQaG9uZSBvciBpUGFkIGZ1bmN0aW9u YWxpdHkuCisKKyAgICAgICAgKiBmYXN0L2Zvcm1zL2lvcy9kaXNtaXNzLXBpY2tlci11c2luZy1r ZXlib2FyZC5odG1sOgorICAgICAgICAqIHJlc291cmNlcy91aS1oZWxwZXIuanM6CisgICAgICAg ICh3aW5kb3cuVUlIZWxwZXIuYWN0aXZhdGVBbmRXYWl0Rm9ySW5wdXRTZXNzaW9uQXQucmV0dXJu Lm5ldy5Qcm9taXNlLik6CisgICAgICAgICh3aW5kb3cuVUlIZWxwZXIud2FpdEZvcklucHV0U2Vz c2lvblRvRGlzbWlzcy5yZXR1cm4ubmV3LlByb21pc2UuKToKKyAgICAgICAgKHdpbmRvdy5VSUhl bHBlci53YWl0Rm9ySW5wdXRTZXNzaW9uVG9EaXNtaXNzLnJldHVybi5uZXcuUHJvbWlzZSk6Cisg ICAgICAgICh3aW5kb3cuVUlIZWxwZXIud2FpdEZvcklucHV0U2Vzc2lvblRvRGlzbWlzcyk6CisK IDIwMTktMTEtMTggIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAg ICBbV2ViIEFuaW1hdGlvbnNdIFJldGFyZ2V0ZWQgdHJhbnNpdGlvbnMgdGFyZ2V0aW5nIGFjY2Vs ZXJhdGVkIHByb3BlcnRpZXMgZG8gbm90IHN0b3AgdGhlIG9yaWdpbmFsIHRyYW5zaXRpb24KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvaW9zL2Rpc21pc3MtcGlja2VyLXVzaW5n LWtleWJvYXJkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL2lvcy9kaXNtaXNzLXBpY2tl ci11c2luZy1rZXlib2FyZC5odG1sCmluZGV4IDIzZmQxZDU4Y2ZkZTkyZjgwNTcyMGRlNDI1ZTdl ZjgwMGI1YTFiMWQuLmE1MmZkODFjYzM3ZmE4ZDBiNzU0OTIxYmI0ODRmYzEwZjMyYTkzN2MgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvaW9zL2Rpc21pc3MtcGlja2VyLXVzaW5n LWtleWJvYXJkLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9pb3MvZGlzbWlzcy1w aWNrZXItdXNpbmcta2V5Ym9hcmQuaHRtbApAQCAtNzAsNyArNzAsNyBAQCBhc3luYyBmdW5jdGlv biBydW5UZXN0KCkKICAgICAgICAgICAgIGxldCBleHBlY3RlZFZhbHVlID0gZWxlbWVudFRvVGVz dC52YWx1ZTsKICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmFjdGl2YXRlRWxlbWVudEFuZFdh aXRGb3JJbnB1dFNlc3Npb24oZWxlbWVudFRvVGVzdCk7CiAgICAgICAgICAgICBVSUhlbHBlci5r ZXlEb3duKGtleUNvbW1hbmQua2V5LCBrZXlDb21tYW5kLm1vZGlmaWVycyk7Ci0gICAgICAgICAg ICBhd2FpdCBVSUhlbHBlci53YWl0Rm9yS2V5Ym9hcmRUb0hpZGUoKTsKKyAgICAgICAgICAgIGF3 YWl0IFVJSGVscGVyLndhaXRGb3JJbnB1dFNlc3Npb25Ub0Rpc21pc3MoKTsKICAgICAgICAgICAg IHNob3VsZEJlRXF1YWxUb1N0cmluZygiZWxlbWVudFRvVGVzdC52YWx1ZSIsIGV4cGVjdGVkVmFs dWUpOwogICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcmVzb3VyY2Vz L3VpLWhlbHBlci5qcyBiL0xheW91dFRlc3RzL3Jlc291cmNlcy91aS1oZWxwZXIuanMKaW5kZXgg YmYzM2FlYjQyMDI2MDk4OWJjMTM2YzJkMzViZTIyZmE4ZTRlMWE5YS4uMzY5ZTY5ZGMwNmMyZjQ5 Y2UzMzQ3MTIxZmQ0NWZkNTMxNDZiMTY0MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcmVzb3Vy Y2VzL3VpLWhlbHBlci5qcworKysgYi9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvdWktaGVscGVyLmpz CkBAIC0zNTQsMTQgKzM1NCwzNCBAQCB3aW5kb3cuVUlIZWxwZXIgPSBjbGFzcyBVSUhlbHBlciB7 CiAgICAgICAgIHJldHVybiBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHsKICAgICAgICAgICAgIHRl c3RSdW5uZXIucnVuVUlTY3JpcHQoYAogICAgICAgICAgICAgICAgIChmdW5jdGlvbigpIHsKLSAg ICAgICAgICAgICAgICAgICAgdWlDb250cm9sbGVyLmRpZFNob3dLZXlib2FyZENhbGxiYWNrID0g ZnVuY3Rpb24oKSB7CisgICAgICAgICAgICAgICAgICAgIGZ1bmN0aW9uIGNsZWFyQ2FsbGJhY2tz QW5kU2NyaXB0Q29tcGxldGUoKSB7CisgICAgICAgICAgICAgICAgICAgICAgICB1aUNvbnRyb2xs ZXIuZGlkU2hvd0tleWJvYXJkQ2FsbGJhY2sgPSBudWxsOworICAgICAgICAgICAgICAgICAgICAg ICAgdWlDb250cm9sbGVyLndpbGxQcmVzZW50UG9wb3ZlckNhbGxiYWNrID0gbnVsbDsKICAgICAg ICAgICAgICAgICAgICAgICAgIHVpQ29udHJvbGxlci51aVNjcmlwdENvbXBsZXRlKCk7Ci0gICAg ICAgICAgICAgICAgICAgIH07CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAg ICAgICAgdWlDb250cm9sbGVyLmRpZFNob3dLZXlib2FyZENhbGxiYWNrID0gY2xlYXJDYWxsYmFj a3NBbmRTY3JpcHRDb21wbGV0ZTsKKyAgICAgICAgICAgICAgICAgICAgdWlDb250cm9sbGVyLndp bGxQcmVzZW50UG9wb3ZlckNhbGxiYWNrID0gY2xlYXJDYWxsYmFja3NBbmRTY3JpcHRDb21wbGV0 ZTsKICAgICAgICAgICAgICAgICAgICAgdWlDb250cm9sbGVyLnNpbmdsZVRhcEF0UG9pbnQoJHt4 fSwgJHt5fSwgZnVuY3Rpb24oKSB7IH0pOwogICAgICAgICAgICAgICAgIH0pKClgLCByZXNvbHZl KTsKICAgICAgICAgfSk7CiAgICAgfQogCisgICAgc3RhdGljIHdhaXRGb3JJbnB1dFNlc3Npb25U b0Rpc21pc3MoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIG5ldyBQcm9taXNlKHJlc29sdmUgPT4g eworICAgICAgICAgICAgdGVzdFJ1bm5lci5ydW5VSVNjcmlwdChgCisgICAgICAgICAgICAgICAg KGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAgICAgICBmdW5jdGlvbiBjbGVhckNhbGxiYWNr c0FuZFNjcmlwdENvbXBsZXRlKCkgeworICAgICAgICAgICAgICAgICAgICAgICAgdWlDb250cm9s bGVyLmRpZEhpZGVLZXlib2FyZENhbGxiYWNrID0gbnVsbDsKKyAgICAgICAgICAgICAgICAgICAg ICAgIHVpQ29udHJvbGxlci5kaWREaXNtaXNzUG9wb3ZlckNhbGxiYWNrID0gbnVsbDsKKyAgICAg ICAgICAgICAgICAgICAgICAgIHVpQ29udHJvbGxlci51aVNjcmlwdENvbXBsZXRlKCk7CisgICAg ICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgdWlDb250cm9sbGVyLmRpZEhp ZGVLZXlib2FyZENhbGxiYWNrID0gY2xlYXJDYWxsYmFja3NBbmRTY3JpcHRDb21wbGV0ZTsKKyAg ICAgICAgICAgICAgICAgICAgdWlDb250cm9sbGVyLmRpZERpc21pc3NQb3BvdmVyQ2FsbGJhY2sg PSBjbGVhckNhbGxiYWNrc0FuZFNjcmlwdENvbXBsZXRlOworICAgICAgICAgICAgICAgIH0pKClg LCByZXNvbHZlKTsKKyAgICAgICAgfSk7CisgICAgfQorCiAgICAgc3RhdGljIGFjdGl2YXRlRWxl bWVudEFuZFdhaXRGb3JJbnB1dFNlc3Npb24oZWxlbWVudCkKICAgICB7CiAgICAgICAgIGNvbnN0 IHggPSBlbGVtZW50Lm9mZnNldExlZnQgKyBlbGVtZW50Lm9mZnNldFdpZHRoIC8gMjsK