184020 2018-03-26 12:15:44 -0700 [Extra zoom mode] Refactor input view controller presentation and dismissal helpers 2018-03-26 14:00:36 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh aestes bdakin commit-queue thorton timothy webkit-bug-importer oldest_to_newest 1409377 0 wenson_hsieh 2018-03-26 12:15:44 -0700 Work towards <rdar://problem/38758727>. Refactor view controller presentation and dismissal, such that first responder status is restored before dismissing down to reveal the focused form control overlay. 1409384 1 336536 wenson_hsieh 2018-03-26 12:49:39 -0700 Created attachment 336536 Patch 1409399 2 336536 commit-queue 2018-03-26 14:00:35 -0700 Comment on attachment 336536 Patch Clearing flags on attachment: 336536 Committed r229986: <https://trac.webkit.org/changeset/229986> 1409400 3 commit-queue 2018-03-26 14:00:36 -0700 All reviewed patches have been landed. Closing bug. 336536 2018-03-26 12:49:39 -0700 2018-03-26 14:00:35 -0700 Patch bug-184020-20180326124939.patch text/plain 11773 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5OTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDI5MTFhMjE3ZWNmZTUyODBm YmIyYWY3ZjRjNzk0YTM1NDBjYzNmYjYuLjU3YjA2NTkwYTgxNDNmNWQ5YmE1MTE4YzI1NWY2MzVk MWE4YzQ0NTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDIgQEAKKzIwMTgtMDMtMjYgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW0V4dHJhIHpvb20gbW9k ZV0gUmVmYWN0b3IgaW5wdXQgdmlldyBjb250cm9sbGVyIHByZXNlbnRhdGlvbiBhbmQgZGlzbWlz c2FsIGhlbHBlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4NDAyMAorICAgICAgICBXb3JrIHRvd2FyZHMgPHJkYXI6Ly9wcm9ibGVtLzM4NzU4NzI3 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGN1 cnJlbnRseSBoYXZlIHNlcGFyYXRlIHByZXNlbnRhdGlvbiBhbmQgZGlzbWlzc2FsIGhlbHBlcnMg Zm9yIGVhY2ggdHlwZSBvZiB2aWV3IGNvbnRyb2xsZXIgY29ycmVzcG9uZGluZyB0bworICAgICAg ICBhIGZvY3VzZWQgZWxlbWVudCB0eXBlLiBUaGlzIGlzIGV4Y2Vzc2l2ZSwgY29uc2lkZXJpbmcg dGhhdCBhbGwgb2YgdGhlc2UgaGVscGVycyBhcmUgb25seSBpbnZva2VkIGZyb20gb25lIHBsYWNl CisgICAgICAgIChlaXRoZXIgLXByZXNlbnRWaWV3Q29udHJvbGxlckZvckN1cnJlbnRBc3Npc3Rl ZE5vZGUgb3IgLWRpc21pc3NBbGxJbnB1dFZpZXdDb250cm9sbGVycyksIHdpdGggdGhlIGV4Y2Vw dGlvbiBvZgorICAgICAgICB0aGUgZm9jdXNlZCBmb3JtIGNvbnRyb2wgb3ZlcmxheS4KKworICAg ICAgICBUaGlzIHJlZmFjdG9yaW5nIGFsbG93cyB1cyB0byB0aGVuIGFkanVzdCB0aGUgdGltaW5n IG9mIGZpcnN0IHJlc3BvbmRlciByZXN0b3JhdGlvbiBsb2dpYywgc3VjaCB0aGF0IHRoZSBmb2N1 c2VkCisgICAgICAgIGZvcm0gY29udHJvbCB2aWV3IGNvbnRyb2xsZXIgY2FuIHJlY2VpdmUgZm9y d2FyZGVkIGV2ZW50cyBmcm9tIHRoZSB3ZWIgdmlldy4gU2VlIGJlbG93IGZvciBtb3JlIGRldGFp bC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1t OgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IHByZXNlbnRGb2N1c2VkRm9ybUNvbnRyb2xWaWV3 Q29udHJvbGxlcjpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBkaXNtaXNzRm9jdXNlZEZv cm1Db250cm9sVmlld0NvbnRyb2xsZXI6XSk6CisKKyAgICAgICAgUmVtb3ZlIGxvZ2ljIHRvIHJl c3RvcmUgdGhlIHdlYiB2aWV3IGFzIGZpcnN0IHJlc3BvbmRlci4KKworICAgICAgICAoLVtXS0Nv bnRlbnRWaWV3IHByZXNlbnRWaWV3Q29udHJvbGxlckZvckN1cnJlbnRBc3Npc3RlZE5vZGVdKToK KyAgICAgICAgKC1bV0tDb250ZW50VmlldyBkaXNtaXNzQWxsSW5wdXRWaWV3Q29udHJvbGxlcnNd KToKKworICAgICAgICBSZXN0b3JlIGZpcnN0IHJlc3BvbmRlciBhZnRlciBkaXNtaXNzaW5nIGEg dmlldyBjb250cm9sbGVyIHRoYXQgd2FzIHByZXNlbnRlZCB3aGVuIGZvY3VzaW5nIGEgZm9ybSBj b250cm9sLCBvbmx5CisgICAgICAgIGlmIHRoZSB3ZWIgdmlldyB3YXMgZmlyc3QgcmVzcG9uZGVy IGJlZm9yZSBwcmVzZW50YXRpb24uCisKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBwcmVzZW50 RGF0ZVBpY2tlclZpZXdDb250cm9sbGVyOl0pOiBEZWxldGVkLgorICAgICAgICAoLVtXS0NvbnRl bnRWaWV3IGRpc21pc3NEYXRlUGlja2VyVmlld0NvbnRyb2xsZXI6XSk6IERlbGV0ZWQuCisgICAg ICAgICgtW1dLQ29udGVudFZpZXcgcHJlc2VudFRpbWVQaWNrZXJWaWV3Q29udHJvbGxlcjpdKTog RGVsZXRlZC4KKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBkaXNtaXNzVGltZVBpY2tlclZpZXdD b250cm9sbGVyOl0pOiBEZWxldGVkLgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IHByZXNlbnRT ZWxlY3RNZW51Vmlld0NvbnRyb2xsZXI6XSk6IERlbGV0ZWQuCisgICAgICAgICgtW1dLQ29udGVu dFZpZXcgZGlzbWlzc1NlbGVjdE1lbnVWaWV3Q29udHJvbGxlcjpdKTogRGVsZXRlZC4KKyAgICAg ICAgKC1bV0tDb250ZW50VmlldyBkaXNtaXNzTnVtYmVyUGFkVmlld0NvbnRyb2xsZXI6XSk6IERl bGV0ZWQuCisgICAgICAgICgtW1dLQ29udGVudFZpZXcgcHJlc2VudE51bWJlclBhZFZpZXdDb250 cm9sbGVyOl0pOiBEZWxldGVkLgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IHByZXNlbnRUZXh0 SW5wdXRWaWV3Q29udHJvbGxlcjpdKTogRGVsZXRlZC4KKyAgICAgICAgKC1bV0tDb250ZW50Vmll dyBkaXNtaXNzVGV4dElucHV0Vmlld0NvbnRyb2xsZXI6XSk6IERlbGV0ZWQuCisKIDIwMTgtMDMt MDYgIEJyaWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEF1dG9tYXRp b246IHByb3ZpZGUgYSB3YXkgdG8gYXNrIGNsaWVudHMgZm9yIGEgbmV3IHRhYiBvciB3aW5kb3cK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50 ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu dGVyYWN0aW9uLm1tCmluZGV4IGZmMzQ5MzFjZTczNjM0ZDg3MjliNjQxYjhjYzZiYzE0NzI5YzI5 ZGUuLjUwNGQ2Y2UzNGEzMTAxYjFjODVmNGVkNTA2MTllZWU1N2YwOGI0OGMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0K KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbQpAQCAtNDE4Miw3OCArNDE4MiwxMiBAQCAtICh2b2lkKXJlbG9hZENvbnRleHRWaWV3Rm9y UHJlc2VudGVkTGlzdFZpZXdDb250cm9sbGVyCiAKICNpZiBFTkFCTEUoRVhUUkFfWk9PTV9NT0RF KQogCi0tICh2b2lkKWRpc21pc3NBbGxJbnB1dFZpZXdDb250cm9sbGVycwotewotICAgIFtzZWxm IGRpc21pc3NUZXh0SW5wdXRWaWV3Q29udHJvbGxlcjpZRVNdOwotICAgIFtzZWxmIGRpc21pc3NO dW1iZXJQYWRWaWV3Q29udHJvbGxlcjpZRVNdOwotICAgIFtzZWxmIGRpc21pc3NTZWxlY3RNZW51 Vmlld0NvbnRyb2xsZXI6WUVTXTsKLSAgICBbc2VsZiBkaXNtaXNzVGltZVBpY2tlclZpZXdDb250 cm9sbGVyOllFU107Ci0gICAgW3NlbGYgZGlzbWlzc0RhdGVQaWNrZXJWaWV3Q29udHJvbGxlcjpZ RVNdOwotfQotCi0tICh2b2lkKXByZXNlbnREYXRlUGlja2VyVmlld0NvbnRyb2xsZXI6KEJPT0wp YW5pbWF0ZWQKLXsKLSAgICBpZiAoX2RhdGVQaWNrZXJWaWV3Q29udHJvbGxlcikKLSAgICAgICAg cmV0dXJuOwotCi0gICAgX2RhdGVQaWNrZXJWaWV3Q29udHJvbGxlciA9IGFkb3B0TlMoW1tXS0Rh dGVQaWNrZXJWaWV3Q29udHJvbGxlciBhbGxvY10gaW5pdFdpdGhUZXh0Ol9hc3Npc3RlZE5vZGVJ bmZvcm1hdGlvbi52YWx1ZSB0ZXh0U3VnZ2VzdGlvbnM6QFsgXV0pOwotICAgIFtfZGF0ZVBpY2tl clZpZXdDb250cm9sbGVyIHNldERlbGVnYXRlOnNlbGZdOwotICAgIFtfZm9jdXNlZEZvcm1Db250 cm9sVmlld0NvbnRyb2xsZXIgcHJlc2VudFZpZXdDb250cm9sbGVyOl9kYXRlUGlja2VyVmlld0Nv bnRyb2xsZXIuZ2V0KCkgYW5pbWF0ZWQ6YW5pbWF0ZWQgY29tcGxldGlvbjpuaWxdOwotfQotCi0t ICh2b2lkKWRpc21pc3NEYXRlUGlja2VyVmlld0NvbnRyb2xsZXI6KEJPT0wpYW5pbWF0ZWQKLXsK LSAgICBpZiAoIV9kYXRlUGlja2VyVmlld0NvbnRyb2xsZXIpCi0gICAgICAgIHJldHVybjsKLQot ICAgIGF1dG8gZGF0ZVBpY2tlclZpZXdDb250cm9sbGVyID0gV1RGTW92ZShfZGF0ZVBpY2tlclZp ZXdDb250cm9sbGVyKTsKLSAgICBbZGF0ZVBpY2tlclZpZXdDb250cm9sbGVyIGRpc21pc3NWaWV3 Q29udHJvbGxlckFuaW1hdGVkOmFuaW1hdGVkIGNvbXBsZXRpb246bmlsXTsKLX0KLQotLSAodm9p ZClwcmVzZW50VGltZVBpY2tlclZpZXdDb250cm9sbGVyOihCT09MKWFuaW1hdGVkCi17Ci0gICAg aWYgKF90aW1lUGlja2VyVmlld0NvbnRyb2xsZXIpCi0gICAgICAgIHJldHVybjsKLQotICAgIF90 aW1lUGlja2VyVmlld0NvbnRyb2xsZXIgPSBhZG9wdE5TKFtbV0tUaW1lUGlja2VyVmlld0NvbnRy b2xsZXIgYWxsb2NdIGluaXRXaXRoVGV4dDpfYXNzaXN0ZWROb2RlSW5mb3JtYXRpb24udmFsdWUg dGV4dFN1Z2dlc3Rpb25zOkBbIF1dKTsKLSAgICBbX3RpbWVQaWNrZXJWaWV3Q29udHJvbGxlciBz ZXREZWxlZ2F0ZTpzZWxmXTsKLSAgICBbX2ZvY3VzZWRGb3JtQ29udHJvbFZpZXdDb250cm9sbGVy IHByZXNlbnRWaWV3Q29udHJvbGxlcjpfdGltZVBpY2tlclZpZXdDb250cm9sbGVyLmdldCgpIGFu aW1hdGVkOmFuaW1hdGVkIGNvbXBsZXRpb246bmlsXTsKLX0KLQotLSAodm9pZClkaXNtaXNzVGlt ZVBpY2tlclZpZXdDb250cm9sbGVyOihCT09MKWFuaW1hdGVkCi17Ci0gICAgaWYgKCFfdGltZVBp Y2tlclZpZXdDb250cm9sbGVyKQotICAgICAgICByZXR1cm47Ci0KLSAgICBhdXRvIHRpbWVQaWNr ZXJWaWV3Q29udHJvbGxlciA9IFdURk1vdmUoX3RpbWVQaWNrZXJWaWV3Q29udHJvbGxlcik7Ci0g ICAgW3RpbWVQaWNrZXJWaWV3Q29udHJvbGxlciBkaXNtaXNzVmlld0NvbnRyb2xsZXJBbmltYXRl ZDphbmltYXRlZCBjb21wbGV0aW9uOm5pbF07Ci19Ci0KLS0gKHZvaWQpcHJlc2VudFNlbGVjdE1l bnVWaWV3Q29udHJvbGxlcjooQk9PTClhbmltYXRlZAotewotICAgIGlmIChfc2VsZWN0TWVudUxp c3RWaWV3Q29udHJvbGxlcikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgX3NlbGVjdE1lbnVMaXN0 Vmlld0NvbnRyb2xsZXIgPSBhZG9wdE5TKFtbV0tTZWxlY3RNZW51TGlzdFZpZXdDb250cm9sbGVy IGFsbG9jXSBpbml0V2l0aERlbGVnYXRlOnNlbGZdKTsKLSAgICBbX2ZvY3VzZWRGb3JtQ29udHJv bFZpZXdDb250cm9sbGVyIHByZXNlbnRWaWV3Q29udHJvbGxlcjpfc2VsZWN0TWVudUxpc3RWaWV3 Q29udHJvbGxlci5nZXQoKSBhbmltYXRlZDphbmltYXRlZCBjb21wbGV0aW9uOm5pbF07Ci19Ci0K LS0gKHZvaWQpZGlzbWlzc1NlbGVjdE1lbnVWaWV3Q29udHJvbGxlcjooQk9PTClhbmltYXRlZAot ewotICAgIGlmICghX3NlbGVjdE1lbnVMaXN0Vmlld0NvbnRyb2xsZXIpCi0gICAgICAgIHJldHVy bjsKLQotICAgIGF1dG8gc2VsZWN0TWVudUxpc3RWaWV3Q29udHJvbGxlciA9IFdURk1vdmUoX3Nl bGVjdE1lbnVMaXN0Vmlld0NvbnRyb2xsZXIpOwotICAgIFtfc2VsZWN0TWVudUxpc3RWaWV3Q29u dHJvbGxlciBkaXNtaXNzVmlld0NvbnRyb2xsZXJBbmltYXRlZDphbmltYXRlZCBjb21wbGV0aW9u Om5pbF07Ci19Ci0KIC0gKHZvaWQpcHJlc2VudEZvY3VzZWRGb3JtQ29udHJvbFZpZXdDb250cm9s bGVyOihCT09MKWFuaW1hdGVkCiB7CiAgICAgaWYgKF9mb2N1c2VkRm9ybUNvbnRyb2xWaWV3Q29u dHJvbGxlcikKICAgICAgICAgcmV0dXJuOwogCiAgICAgKytfd2ViVmlldy0+X2FjdGl2ZUZvY3Vz ZWRTdGF0ZVJldGFpbkNvdW50OwotICAgIF9zaG91bGRSZXN0b3JlRmlyc3RSZXNwb25kZXJTdGF0 dXNBZnRlckxvc2luZ0ZvY3VzID0gc2VsZi5pc0ZpcnN0UmVzcG9uZGVyOwogCiAgICAgX2ZvY3Vz ZWRGb3JtQ29udHJvbFZpZXdDb250cm9sbGVyID0gYWRvcHROUyhbW1dLRm9jdXNlZEZvcm1Db250 cm9sVmlld0NvbnRyb2xsZXIgYWxsb2NdIGluaXRdKTsKICAgICBbX2ZvY3VzZWRGb3JtQ29udHJv bFZpZXdDb250cm9sbGVyIHNldERlbGVnYXRlOnNlbGZdOwpAQCAtNDI2MSwxNSArNDE5NSw2IEBA IC0gKHZvaWQpcHJlc2VudEZvY3VzZWRGb3JtQ29udHJvbFZpZXdDb250cm9sbGVyOihCT09MKWFu aW1hdGVkCiAgICAgW3NlbGYgc2V0SW5wdXREZWxlZ2F0ZTpfZm9jdXNlZEZvcm1Db250cm9sVmll d0NvbnRyb2xsZXIuZ2V0KCldOwogfQogCi0tICh2b2lkKWRpc21pc3NOdW1iZXJQYWRWaWV3Q29u dHJvbGxlcjooQk9PTClhbmltYXRlZAotewotICAgIGlmICghX251bWJlclBhZFZpZXdDb250cm9s bGVyKQotICAgICAgICByZXR1cm47Ci0KLSAgICBhdXRvIG51bWJlclBhZFZpZXdDb250cm9sbGVy ID0gV1RGTW92ZShfbnVtYmVyUGFkVmlld0NvbnRyb2xsZXIpOwotICAgIFtudW1iZXJQYWRWaWV3 Q29udHJvbGxlciBkaXNtaXNzVmlld0NvbnRyb2xsZXJBbmltYXRlZDphbmltYXRlZCBjb21wbGV0 aW9uOm5pbF07Ci19Ci0KIC0gKHZvaWQpZGlzbWlzc0ZvY3VzZWRGb3JtQ29udHJvbFZpZXdDb250 cm9sbGVyOihCT09MKWFuaW1hdGVkCiB7CiAgICAgaWYgKCFfZm9jdXNlZEZvcm1Db250cm9sVmll d0NvbnRyb2xsZXIpCkBAIC00Mjc3LDY5ICs0MjAyLDgxIEBAIC0gKHZvaWQpZGlzbWlzc0ZvY3Vz ZWRGb3JtQ29udHJvbFZpZXdDb250cm9sbGVyOihCT09MKWFuaW1hdGVkCiAKICAgICAtLV93ZWJW aWV3LT5fYWN0aXZlRm9jdXNlZFN0YXRlUmV0YWluQ291bnQ7CiAKLSAgICBpZiAoX3Nob3VsZFJl c3RvcmVGaXJzdFJlc3BvbmRlclN0YXR1c0FmdGVyTG9zaW5nRm9jdXMgJiYgIXNlbGYuaXNGaXJz dFJlc3BvbmRlcikgewotICAgICAgICBfc2hvdWxkUmVzdG9yZUZpcnN0UmVzcG9uZGVyU3RhdHVz QWZ0ZXJMb3NpbmdGb2N1cyA9IE5POwotICAgICAgICBbc2VsZiBiZWNvbWVGaXJzdFJlc3BvbmRl cl07Ci0gICAgfQotCiAgICAgW19mb2N1c2VkRm9ybUNvbnRyb2xWaWV3Q29udHJvbGxlciBkaXNt aXNzVmlld0NvbnRyb2xsZXJBbmltYXRlZDphbmltYXRlZCBjb21wbGV0aW9uOm5pbF07CiAgICAg X2ZvY3VzZWRGb3JtQ29udHJvbFZpZXdDb250cm9sbGVyID0gbmlsOwogICAgIFtzZWxmIHNldElu cHV0RGVsZWdhdGU6bmlsXTsKIH0KIAotLSAodm9pZClwcmVzZW50TnVtYmVyUGFkVmlld0NvbnRy b2xsZXI6KEJPT0wpYW5pbWF0ZWQKLXsKLSAgICBpZiAoX251bWJlclBhZFZpZXdDb250cm9sbGVy KQotICAgICAgICByZXR1cm47Ci0KLSAgICBfbnVtYmVyUGFkVmlld0NvbnRyb2xsZXIgPSBhZG9w dE5TKFtbV0tOdW1iZXJQYWRWaWV3Q29udHJvbGxlciBhbGxvY10gaW5pdFdpdGhUZXh0Ol9hc3Np c3RlZE5vZGVJbmZvcm1hdGlvbi52YWx1ZSB0ZXh0U3VnZ2VzdGlvbnM6QFtdXSk7Ci0gICAgW19u dW1iZXJQYWRWaWV3Q29udHJvbGxlciBzZXREZWxlZ2F0ZTpzZWxmXTsKLSAgICBbX2ZvY3VzZWRG b3JtQ29udHJvbFZpZXdDb250cm9sbGVyIHByZXNlbnRWaWV3Q29udHJvbGxlcjpfbnVtYmVyUGFk Vmlld0NvbnRyb2xsZXIuZ2V0KCkgYW5pbWF0ZWQ6YW5pbWF0ZWQgY29tcGxldGlvbjpuaWxdOwot fQotCiAtICh2b2lkKXByZXNlbnRWaWV3Q29udHJvbGxlckZvckN1cnJlbnRBc3Npc3RlZE5vZGUK IHsKICAgICBbc2VsZiBkaXNtaXNzQWxsSW5wdXRWaWV3Q29udHJvbGxlcnNdOwogCisgICAgX3No b3VsZFJlc3RvcmVGaXJzdFJlc3BvbmRlclN0YXR1c0FmdGVyTG9zaW5nRm9jdXMgPSBzZWxmLmlz Rmlyc3RSZXNwb25kZXI7CisKICAgICBzd2l0Y2ggKF9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5l bGVtZW50VHlwZSkgewogICAgIGNhc2UgSW5wdXRUeXBlOjpOdW1iZXI6CiAgICAgY2FzZSBJbnB1 dFR5cGU6Ok51bWJlclBhZDoKICAgICBjYXNlIElucHV0VHlwZTo6UGhvbmU6Ci0gICAgICAgIFtz ZWxmIHByZXNlbnROdW1iZXJQYWRWaWV3Q29udHJvbGxlcjpZRVNdOworICAgICAgICBpZiAoIV9u dW1iZXJQYWRWaWV3Q29udHJvbGxlcikgeworICAgICAgICAgICAgX251bWJlclBhZFZpZXdDb250 cm9sbGVyID0gYWRvcHROUyhbW1dLTnVtYmVyUGFkVmlld0NvbnRyb2xsZXIgYWxsb2NdIGluaXRX aXRoVGV4dDpfYXNzaXN0ZWROb2RlSW5mb3JtYXRpb24udmFsdWUgdGV4dFN1Z2dlc3Rpb25zOkBb XV0pOworICAgICAgICAgICAgW19udW1iZXJQYWRWaWV3Q29udHJvbGxlciBzZXREZWxlZ2F0ZTpz ZWxmXTsKKyAgICAgICAgICAgIFtfZm9jdXNlZEZvcm1Db250cm9sVmlld0NvbnRyb2xsZXIgcHJl c2VudFZpZXdDb250cm9sbGVyOl9udW1iZXJQYWRWaWV3Q29udHJvbGxlci5nZXQoKSBhbmltYXRl ZDpZRVMgY29tcGxldGlvbjpuaWxdOworICAgICAgICB9CiAgICAgICAgIGJyZWFrOwogICAgIGNh c2UgSW5wdXRUeXBlOjpTZWxlY3Q6Ci0gICAgICAgIFtzZWxmIHByZXNlbnRTZWxlY3RNZW51Vmll d0NvbnRyb2xsZXI6WUVTXTsKKyAgICAgICAgaWYgKCFfc2VsZWN0TWVudUxpc3RWaWV3Q29udHJv bGxlcikgeworICAgICAgICAgICAgX3NlbGVjdE1lbnVMaXN0Vmlld0NvbnRyb2xsZXIgPSBhZG9w dE5TKFtbV0tTZWxlY3RNZW51TGlzdFZpZXdDb250cm9sbGVyIGFsbG9jXSBpbml0V2l0aERlbGVn YXRlOnNlbGZdKTsKKyAgICAgICAgICAgIFtfZm9jdXNlZEZvcm1Db250cm9sVmlld0NvbnRyb2xs ZXIgcHJlc2VudFZpZXdDb250cm9sbGVyOl9zZWxlY3RNZW51TGlzdFZpZXdDb250cm9sbGVyLmdl dCgpIGFuaW1hdGVkOllFUyBjb21wbGV0aW9uOm5pbF07CisgICAgICAgIH0KICAgICAgICAgYnJl YWs7CiAgICAgY2FzZSBJbnB1dFR5cGU6OlRpbWU6Ci0gICAgICAgIFtzZWxmIHByZXNlbnRUaW1l UGlja2VyVmlld0NvbnRyb2xsZXI6WUVTXTsKKyAgICAgICAgaWYgKCFfdGltZVBpY2tlclZpZXdD b250cm9sbGVyKSB7CisgICAgICAgICAgICBfdGltZVBpY2tlclZpZXdDb250cm9sbGVyID0gYWRv cHROUyhbW1dLVGltZVBpY2tlclZpZXdDb250cm9sbGVyIGFsbG9jXSBpbml0V2l0aFRleHQ6X2Fz c2lzdGVkTm9kZUluZm9ybWF0aW9uLnZhbHVlIHRleHRTdWdnZXN0aW9uczpAWyBdXSk7CisgICAg ICAgICAgICBbX3RpbWVQaWNrZXJWaWV3Q29udHJvbGxlciBzZXREZWxlZ2F0ZTpzZWxmXTsKKyAg ICAgICAgICAgIFtfZm9jdXNlZEZvcm1Db250cm9sVmlld0NvbnRyb2xsZXIgcHJlc2VudFZpZXdD b250cm9sbGVyOl90aW1lUGlja2VyVmlld0NvbnRyb2xsZXIuZ2V0KCkgYW5pbWF0ZWQ6WUVTIGNv bXBsZXRpb246bmlsXTsKKyAgICAgICAgfQogICAgICAgICBicmVhazsKICAgICBjYXNlIElucHV0 VHlwZTo6RGF0ZToKLSAgICAgICAgW3NlbGYgcHJlc2VudERhdGVQaWNrZXJWaWV3Q29udHJvbGxl cjpZRVNdOworICAgICAgICBpZiAoIV9kYXRlUGlja2VyVmlld0NvbnRyb2xsZXIpIHsKKyAgICAg ICAgICAgIF9kYXRlUGlja2VyVmlld0NvbnRyb2xsZXIgPSBhZG9wdE5TKFtbV0tEYXRlUGlja2Vy Vmlld0NvbnRyb2xsZXIgYWxsb2NdIGluaXRXaXRoVGV4dDpfYXNzaXN0ZWROb2RlSW5mb3JtYXRp b24udmFsdWUgdGV4dFN1Z2dlc3Rpb25zOkBbIF1dKTsKKyAgICAgICAgICAgIFtfZGF0ZVBpY2tl clZpZXdDb250cm9sbGVyIHNldERlbGVnYXRlOnNlbGZdOworICAgICAgICAgICAgW19mb2N1c2Vk Rm9ybUNvbnRyb2xWaWV3Q29udHJvbGxlciBwcmVzZW50Vmlld0NvbnRyb2xsZXI6X2RhdGVQaWNr ZXJWaWV3Q29udHJvbGxlci5nZXQoKSBhbmltYXRlZDpZRVMgY29tcGxldGlvbjpuaWxdOworICAg ICAgICB9CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgSW5wdXRUeXBlOjpOb25lOgorICAgICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKLSAg ICAgICAgW3NlbGYgcHJlc2VudFRleHRJbnB1dFZpZXdDb250cm9sbGVyOllFU107CisgICAgICAg IGlmICghX3RleHRJbnB1dExpc3RWaWV3Q29udHJvbGxlcikgeworICAgICAgICAgICAgX3RleHRJ bnB1dExpc3RWaWV3Q29udHJvbGxlciA9IGFkb3B0TlMoW1tXS1RleHRJbnB1dExpc3RWaWV3Q29u dHJvbGxlciBhbGxvY10gaW5pdFdpdGhEZWxlZ2F0ZTpzZWxmXSk7CisgICAgICAgICAgICBbX2Zv Y3VzZWRGb3JtQ29udHJvbFZpZXdDb250cm9sbGVyIHByZXNlbnRWaWV3Q29udHJvbGxlcjpfdGV4 dElucHV0TGlzdFZpZXdDb250cm9sbGVyLmdldCgpIGFuaW1hdGVkOllFUyBjb21wbGV0aW9uOm5p bF07CisgICAgICAgIH0KICAgICAgICAgYnJlYWs7CiAgICAgfQogfQogCi0tICh2b2lkKXByZXNl bnRUZXh0SW5wdXRWaWV3Q29udHJvbGxlcjooQk9PTClhbmltYXRlZAorLSAodm9pZClkaXNtaXNz QWxsSW5wdXRWaWV3Q29udHJvbGxlcnMKIHsKLSAgICBpZiAoX3RleHRJbnB1dExpc3RWaWV3Q29u dHJvbGxlcikKLSAgICAgICAgcmV0dXJuOworICAgIGlmIChhdXRvIGNvbnRyb2xsZXIgPSBXVEZN b3ZlKF90ZXh0SW5wdXRMaXN0Vmlld0NvbnRyb2xsZXIpKQorICAgICAgICBbY29udHJvbGxlciBk aXNtaXNzVmlld0NvbnRyb2xsZXJBbmltYXRlZDpZRVMgY29tcGxldGlvbjpuaWxdOwogCi0gICAg X3RleHRJbnB1dExpc3RWaWV3Q29udHJvbGxlciA9IGFkb3B0TlMoW1tXS1RleHRJbnB1dExpc3RW aWV3Q29udHJvbGxlciBhbGxvY10gaW5pdFdpdGhEZWxlZ2F0ZTpzZWxmXSk7Ci0gICAgW19mb2N1 c2VkRm9ybUNvbnRyb2xWaWV3Q29udHJvbGxlciBwcmVzZW50Vmlld0NvbnRyb2xsZXI6X3RleHRJ bnB1dExpc3RWaWV3Q29udHJvbGxlci5nZXQoKSBhbmltYXRlZDphbmltYXRlZCBjb21wbGV0aW9u Om5pbF07Ci19CisgICAgaWYgKGF1dG8gY29udHJvbGxlciA9IFdURk1vdmUoX251bWJlclBhZFZp ZXdDb250cm9sbGVyKSkKKyAgICAgICAgW2NvbnRyb2xsZXIgZGlzbWlzc1ZpZXdDb250cm9sbGVy QW5pbWF0ZWQ6WUVTIGNvbXBsZXRpb246bmlsXTsKIAotLSAodm9pZClkaXNtaXNzVGV4dElucHV0 Vmlld0NvbnRyb2xsZXI6KEJPT0wpYW5pbWF0ZWQKLXsKLSAgICBpZiAoIV90ZXh0SW5wdXRMaXN0 Vmlld0NvbnRyb2xsZXIpCi0gICAgICAgIHJldHVybjsKKyAgICBpZiAoYXV0byBjb250cm9sbGVy ID0gV1RGTW92ZShfc2VsZWN0TWVudUxpc3RWaWV3Q29udHJvbGxlcikpCisgICAgICAgIFtjb250 cm9sbGVyIGRpc21pc3NWaWV3Q29udHJvbGxlckFuaW1hdGVkOllFUyBjb21wbGV0aW9uOm5pbF07 CiAKLSAgICBhdXRvIHRleHRJbnB1dExpc3RWaWV3Q29udHJvbGxlciA9IFdURk1vdmUoX3RleHRJ bnB1dExpc3RWaWV3Q29udHJvbGxlcik7Ci0gICAgW3RleHRJbnB1dExpc3RWaWV3Q29udHJvbGxl ciBkaXNtaXNzVmlld0NvbnRyb2xsZXJBbmltYXRlZDphbmltYXRlZCBjb21wbGV0aW9uOm5pbF07 CisgICAgaWYgKGF1dG8gY29udHJvbGxlciA9IFdURk1vdmUoX3RpbWVQaWNrZXJWaWV3Q29udHJv bGxlcikpCisgICAgICAgIFtjb250cm9sbGVyIGRpc21pc3NWaWV3Q29udHJvbGxlckFuaW1hdGVk OllFUyBjb21wbGV0aW9uOm5pbF07CisKKyAgICBpZiAoYXV0byBjb250cm9sbGVyID0gV1RGTW92 ZShfZGF0ZVBpY2tlclZpZXdDb250cm9sbGVyKSkKKyAgICAgICAgW2NvbnRyb2xsZXIgZGlzbWlz c1ZpZXdDb250cm9sbGVyQW5pbWF0ZWQ6WUVTIGNvbXBsZXRpb246bmlsXTsKKworICAgIGlmIChf c2hvdWxkUmVzdG9yZUZpcnN0UmVzcG9uZGVyU3RhdHVzQWZ0ZXJMb3NpbmdGb2N1cykgeworICAg ICAgICBfc2hvdWxkUmVzdG9yZUZpcnN0UmVzcG9uZGVyU3RhdHVzQWZ0ZXJMb3NpbmdGb2N1cyA9 IE5POworICAgICAgICBpZiAoIXNlbGYuaXNGaXJzdFJlc3BvbmRlcikKKyAgICAgICAgICAgIFtz ZWxmIGJlY29tZUZpcnN0UmVzcG9uZGVyXTsKKyAgICB9CiB9CiAKIC0gKHZvaWQpdGV4dElucHV0 Q29udHJvbGxlcjooV0tUZXh0Rm9ybUNvbnRyb2xWaWV3Q29udHJvbGxlciAqKWNvbnRyb2xsZXIg ZGlkQ29tbWl0VGV4dDooTlNTdHJpbmcgKil0ZXh0Cg==