225883 2021-05-17 13:48:56 -0700 [Modern Media Controls] promote submenus items if there is only one 2021-05-17 18:20:34 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 hi hi bdakin calvaris eric.carlson ews-watchlist glenn hi jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1760865 0 hi 2021-05-17 13:48:56 -0700 if a video only has subtitles and not any other languages, we should make the "Subtitles" menu top-level (i.e. have "Subtitles" be the title of the entire contextmenu instead of being a submenu of a title-less contextmenu) when tapping the tracks button 1760874 1 428865 hi 2021-05-17 14:01:43 -0700 Created attachment 428865 Patch 1760959 2 ews-feeder 2021-05-17 17:09:25 -0700 Committed r277616 (237831@main): <https://commits.webkit.org/237831@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428865. 1760962 3 webkit-bug-importer 2021-05-17 17:10:38 -0700 <rdar://problem/78129608> 428865 2021-05-17 14:01:43 -0700 2021-05-17 17:09:26 -0700 Patch bug-225883-20210517150142.patch text/plain 13267 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1ZTdlZGUxMWI1NWI1M2ZhZDU0Y2Q2OWIwMjk3ZjhjNDc5NzRmOWM4Li5l NzRkZWY3MjZlOWRiMmY4NmZhYTJiMGMzYmNiMjNhOWY2MTk2ZGZlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjQgQEAKKzIwMjEtMDUtMTcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFtNb2Rlcm4gTWVkaWEgQ29udHJvbHNdIHByb21vdGUgc3VibWVudXMgaXRl bXMgaWYgdGhlcmUgaXMgb25seSBvbmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIyNTg4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFzIGFuIGV4YW1wbGUsIGlmIGEgYDx2aWRlbz5gIG9ubHkgaGFzIHN1 YnRpdGxlcyBhbmQgbm90IGFueSBvdGhlciBsYW5ndWFnZXMsIHRoZSAiU3VidGl0bGVzIgorICAg ICAgICBzdWJtZW51IHNob3VsZCByZWFsbHkgYmUgdG9wLWxldmVsIChpLmUuIGhhdmUgIlN1YnRp dGxlcyIgYmUgdGhlIHRpdGxlIG9mIHRoZSBlbnRpcmUKKyAgICAgICAgY29udGV4dG1lbnUgaW5z dGVhZCBvZiBiZWluZyBhIHN1Ym1lbnUgb2YgYSB0aXRsZS1sZXNzIGNvbnRleHRtZW51KSBpbiB0 aGUgY29udGV4dG1lbnUgc2hvd24KKyAgICAgICAgd2hlbiB0YXBwaW5nIHRoZSB0cmFja3MgYnV0 dG9uLgorCisgICAgICAgIFRlc3RzOiBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tz LXN1cHBvcnQvYXV0by10ZXh0LXRyYWNrLmh0bWwKKyAgICAgICAgICAgICAgIG1lZGlhL21vZGVy bi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9jbGljay10cmFjay1pbi1jb250ZXh0bWVu dS5odG1sCisgICAgICAgICAgICAgICBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tz LXN1cHBvcnQvaGlkZGVuLXRyYWNrcy5odG1sCisgICAgICAgICAgICAgICBtZWRpYS9tb2Rlcm4t bWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvb2ZmLXRleHQtdHJhY2suaHRtbAorICAgICAg ICAgICAgICAgbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L3RleHQt dHJhY2stc2VsZWN0ZWQtdmlhLW1lZGlhLWFwaS5odG1sCisKKyAgICAgICAgKiBNb2R1bGVzL21l ZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVk aWFDb250cm9sc0hvc3Q6OnNob3dNZWRpYUNvbnRyb2xzQ29udGV4dE1lbnUpOgorCiAyMDIxLTA1 LTE3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgTnVsbCBjaGVjayBtX3Jlc291cmNlIGluIFN1YnJlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZl UmVzcG9uc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKaW5kZXggMGRkYzIxMTQ5NmEwZTEwMDliNjA5ZjcxMWM2NWUyOTQyNTY3 MjJjOS4uMTc5NjYwNTE2MTY5YzhlNzQ1MWM5YWM2NmM3NGNkNDBlNGU1ODMxOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxOCBAQAorMjAyMS0wNS0xNyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBs ZS5jb20+CisKKyAgICAgICAgW01vZGVybiBNZWRpYSBDb250cm9sc10gcHJvbW90ZSBzdWJtZW51 cyBpdGVtcyBpZiB0aGVyZSBpcyBvbmx5IG9uZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1ODgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQXMgYW4gZXhhbXBsZSwgaWYgYSBgPHZpZGVvPmAgb25seSBo YXMgc3VidGl0bGVzIGFuZCBub3QgYW55IG90aGVyIGxhbmd1YWdlcywgdGhlICJTdWJ0aXRsZXMi CisgICAgICAgIHN1Ym1lbnUgc2hvdWxkIHJlYWxseSBiZSB0b3AtbGV2ZWwgKGkuZS4gaGF2ZSAi U3VidGl0bGVzIiBiZSB0aGUgdGl0bGUgb2YgdGhlIGVudGlyZQorICAgICAgICBjb250ZXh0bWVu dSBpbnN0ZWFkIG9mIGJlaW5nIGEgc3VibWVudSBvZiBhIHRpdGxlLWxlc3MgY29udGV4dG1lbnUp IGluIHRoZSBjb250ZXh0bWVudSBzaG93bgorICAgICAgICB3aGVuIHRhcHBpbmcgdGhlIHRyYWNr cyBidXR0b24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3Rh bnQubW06CisgICAgICAgICgtW1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQgc2hvd01lZGlhQ29udHJv bHNDb250ZXh0TWVudTppdGVtczpjb21wbGV0aW9uSGFuZGxlcjpdKToKKwogMjAyMS0wNS0xNCAg U2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBBbGxvdyB3 aGVlbCBldmVudHMgdG8gYmUgY29hbGVzY2VkIGR1cmluZyBzY3JvbGwgZGVjZWxlcmF0aW9uCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250 cm9sc0hvc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlh Q29udHJvbHNIb3N0LmNwcAppbmRleCA0YzRmZTU0YjIwNWJhYjVhYmZiMzZhZjY4ODc3ZGMwMWU1 YmY2N2QxLi4yYWZlN2ViZDVlYTUyNGNlZjBlODc1YmEyZGNhOTY4YzdhYzQ1YzQ3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hv c3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNv bnRyb2xzSG9zdC5jcHAKQEAgLTU5MSw3ICs1OTEsNyBAQCBib29sIE1lZGlhQ29udHJvbHNIb3N0 OjpzaG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51KEhUTUxFbGVtZW50JiB0YXJnZXQsIFN0cmlu ZwogI2VuZGlmCiAKICNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykgJiYgVVNFKEFDQ0VTU0lCSUxJ VFlfQ09OVEVYVF9NRU5VUykKLSAgICBpZiAob3B0aW9uc0pTT05PYmplY3QtPmdldEJvb2xlYW4o InByb21vdGVTdWJNZW51cyJfcykudmFsdWVPcihmYWxzZSkpIHsKKyAgICBpZiAoKGl0ZW1zLnNp emUoKSA9PSAxICYmIGl0ZW1zWzBdLnR5cGUoKSA9PSBTdWJtZW51VHlwZSkgfHwgb3B0aW9uc0pT T05PYmplY3QtPmdldEJvb2xlYW4oInByb21vdGVTdWJNZW51cyJfcykudmFsdWVPcihmYWxzZSkp IHsKICAgICAgICAgZm9yIChhdXRvJiYgaXRlbSA6IHN0ZDo6ZXhjaGFuZ2UoaXRlbXMsIHsgfSkp IHsKICAgICAgICAgICAgIGlmICghaXRlbXMuaXNFbXB0eSgpKQogICAgICAgICAgICAgICAgIGl0 ZW1zLmFwcGVuZCh7IFNlcGFyYXRvclR5cGUsIGludmFsaWRNZW51SXRlbUlkZW50aWZpZXIsIC8q IHRpdGxlICovIG51bGxTdHJpbmcoKSB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0KaW5kZXggZGIwNmJjNjcyNDE2ZDc4 ZmY0N2ZkMmM0ZWU4NDJlYjUwYmQwYTZkNS4uZmQwODZmYWM2NTQ2YWZmY2NkMDYyZjQ1NjhlZWFk YWUyZWUwOGU2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0 aW9uU2hlZXRBc3Npc3RhbnQubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL QWN0aW9uU2hlZXRBc3Npc3RhbnQubW0KQEAgLTgyNSwxMiArODI1LDE4IEBAIC0gKHZvaWQpc2hv d01lZGlhQ29udHJvbHNDb250ZXh0TWVudTooV2ViQ29yZTo6RmxvYXRSZWN0JiYpdGFyZ2V0RnJh bWUgaXRlbXM6KFZlCiAgICAgQVNTRVJUKCFfbWVkaWFDb250cm9sc0NvbnRleHRNZW51KTsKICAg ICBBU1NFUlQoIV9tZWRpYUNvbnRyb2xzQ29udGV4dE1lbnVDYWxsYmFjayk7CiAKKyAgICBTdHJp bmcgbWVudVRpdGxlOworICAgIGlmIChpdGVtcy5zaXplKCkgPT0gMSkgeworICAgICAgICBtZW51 VGl0bGUgPSBXVEZNb3ZlKGl0ZW1zWzBdLnRpdGxlKTsKKyAgICAgICAgaXRlbXMgPSBXVEZNb3Zl KGl0ZW1zWzBdLmNoaWxkcmVuKTsKKyAgICB9CisKICAgICBpZiAoaXRlbXMuaXNFbXB0eSgpKSB7 CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNDb250ZXh0 TWVudUl0ZW06OmludmFsaWRJRCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBfbWVk aWFDb250cm9sc0NvbnRleHRNZW51ID0gW1VJTWVudSBtZW51V2l0aFRpdGxlOkAiIiBjaGlsZHJl bjpbc2VsZiBfdWlNZW51RWxlbWVudHNGb3JNZWRpYUNvbnRyb2xDb250ZXh0TWVudUl0ZW1zOldU Rk1vdmUoaXRlbXMpXV07CisgICAgX21lZGlhQ29udHJvbHNDb250ZXh0TWVudSA9IFtVSU1lbnUg bWVudVdpdGhUaXRsZTpXVEZNb3ZlKG1lbnVUaXRsZSkgY2hpbGRyZW46W3NlbGYgX3VpTWVudUVs ZW1lbnRzRm9yTWVkaWFDb250cm9sQ29udGV4dE1lbnVJdGVtczpXVEZNb3ZlKGl0ZW1zKV1dOwog ICAgIF9tZWRpYUNvbnRyb2xzQ29udGV4dE1lbnVUYXJnZXRGcmFtZSA9IFdURk1vdmUodGFyZ2V0 RnJhbWUpOwogICAgIF9tZWRpYUNvbnRyb2xzQ29udGV4dE1lbnVDYWxsYmFjayA9IFdURk1vdmUo Y29tcGxldGlvbkhhbmRsZXIpOwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNmExOTk4MjIyOWQyNmRjMjc5YzFmNGY4ZjZk YzBjMmIwNmFhODRlZC4uMDMxZGJhNmI2ODU4ZTVlNTg2YzBiYTg3OTlmODNlYTFkOWQ4MjAzMCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA1LTE3ICBEZXZpbiBSb3Vzc28gIDxkcm91c3Nv QGFwcGxlLmNvbT4KKworICAgICAgICBbTW9kZXJuIE1lZGlhIENvbnRyb2xzXSBwcm9tb3RlIHN1 Ym1lbnVzIGl0ZW1zIGlmIHRoZXJlIGlzIG9ubHkgb25lCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU4ODMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90 cmFja3Mtc3VwcG9ydC9hdXRvLXRleHQtdHJhY2suaHRtbDoKKyAgICAgICAgKiBtZWRpYS9tb2Rl cm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvY2xpY2stdHJhY2staW4tY29udGV4dG1l bnUuaHRtbDoKKyAgICAgICAgKiBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1 cHBvcnQvaGlkZGVuLXRyYWNrcy5odG1sOgorICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1j b250cm9scy90cmFja3Mtc3VwcG9ydC9vZmYtdGV4dC10cmFjay5odG1sOgorICAgICAgICAqIG1l ZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90ZXh0LXRyYWNrLXNlbGVj dGVkLXZpYS1tZWRpYS1hcGkuaHRtbDoKKwogMjAyMS0wNS0xNyAgWW91ZW5uIEZhYmxldCAgPHlv dWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgWyBCaWdTdXIgRGVidWcgd2syIEFSTTY0IF0gaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy93ZWJydGMtZW5jb2RlZC10cmFuc2Zvcm0vc2Zy YW1lLXRyYW5zZm9ybS1yZWFkYWJsZS5odG1sIGlzIGZsYWt5IGNyYXNoaW5nCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQv YXV0by10ZXh0LXRyYWNrLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29u dHJvbHMvdHJhY2tzLXN1cHBvcnQvYXV0by10ZXh0LXRyYWNrLmh0bWwKaW5kZXggOGIyZjdjODEw NmM2ZDQ2YmM4NGE2NWJlYjQ5YjdmMDZjZjNjMWRlNy4uN2Q4MmEzYWEzOTg4YTAzMTFlMDFkNWRi NmNjZDY1MDc3ODY2YTUxYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1l ZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2F1dG8tdGV4dC10cmFjay5odG1sCisrKyBiL0xh eW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9hdXRv LXRleHQtdHJhY2suaHRtbApAQCAtMjksMTMgKzI5LDYgQEAgbWVkaWEuYWRkRXZlbnRMaXN0ZW5l cigicGxheSIsICgpID0+IHsKICAgICAgICAgICAgIGRlYnVnKCJUYXBwaW5nIHRyYWNrcyBidXR0 b24uLi4iKTsKICAgICAgICAgICAgIGF3YWl0IHByZXNzT25FbGVtZW50KHNoYWRvd1Jvb3QucXVl cnlTZWxlY3RvcigiYnV0dG9uLnRyYWNrcyIpKTsKICAgICAgICAgICAgIGNvbnRleHRtZW51ID0g YXdhaXQgZ2V0VHJhY2tzQ29udGV4dE1lbnUoKTsKLQotICAgICAgICAgICAgbGV0IHN1YnRpdGxl c01lbnUgPSBjb250ZXh0bWVudVswXS5jaGlsZHJlbi5maW5kKChzdWJtZW51KSA9PiBzdWJtZW51 LnRpdGxlID09PSAiU3VidGl0bGVzIik7Ci0gICAgICAgICAgICBpZiAoc3VidGl0bGVzTWVudT8u Y2hpbGRyZW4/Lmxlbmd0aCkgewotICAgICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmNob29z ZU1lbnVBY3Rpb24oc3VidGl0bGVzTWVudS50aXRsZSk7Ci0gICAgICAgICAgICAgICAgYXdhaXQg VUlIZWxwZXIuZGVsYXlGb3IoNTAwKTsgLy8gZ2l2ZSB0aW1lIGZvciB0aGUgVUlNZW51IHRvIGFu aW1hdGUKLSAgICAgICAgICAgICAgICBjb250ZXh0bWVudSA9IFtzdWJ0aXRsZXNNZW51XTsKLSAg ICAgICAgICAgIH0KICAgICAgICAgICAgIGNoZWNrZWRJdGVtcyA9IGNvbnRleHRtZW51WzBdLmNo aWxkcmVuLmZpbHRlcigoaXRlbSkgPT4gaXRlbS5jaGVja2VkKTsKICAgICAgICAgICAgIHNob3Vs ZEJlKCJjaGVja2VkSXRlbXMubGVuZ3RoIiwgIjEiKTsKICAgICAgICAgICAgIHNob3VsZEJlRXF1 YWxUb1N0cmluZygiY2hlY2tlZEl0ZW1zWzBdLnRpdGxlIiwgIkF1dG8gKFJlY29tbWVuZGVkKSIp OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3Ry YWNrcy1zdXBwb3J0L2NsaWNrLXRyYWNrLWluLWNvbnRleHRtZW51Lmh0bWwgYi9MYXlvdXRUZXN0 cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvY2xpY2stdHJhY2st aW4tY29udGV4dG1lbnUuaHRtbAppbmRleCA1MmY1ZjFmMzZlNDZkMzQyNWI5MjRjYjA1YTY1ZDVh YjgyMDdjOTI3Li45Y2VhOTFlNzI3MzMyOGQyYWFlZGZmZWZiODhjZGU2NTdjMDdjMzc2IDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1 cHBvcnQvY2xpY2stdHJhY2staW4tY29udGV4dG1lbnUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9t ZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvY2xpY2stdHJhY2staW4t Y29udGV4dG1lbnUuaHRtbApAQCAtNDMsMjQgKzQzLDE0IEBAIGZ1bmN0aW9uIGNsaWNrT25UcmFj a3NCdXR0b24oY29udGludWF0aW9uKQogYXN5bmMgZnVuY3Rpb24gY2xpY2tPbkZyZW5jaEF1ZGlv VHJhY2soKQogewogICAgIGRlYnVnKCJTZWxlY3RpbmcgJ0ZyZW5jaCcgdHJhY2suLi4iKTsKLSAg ICBsZXQgY29udGV4dG1lbnUgPSBhd2FpdCBnZXRUcmFja3NDb250ZXh0TWVudSgpOwotICAgIGxl dCBsYW5ndWFnZXNNZW51ID0gY29udGV4dG1lbnVbMF0uY2hpbGRyZW4uZmluZCgoc3VibWVudSkg PT4gc3VibWVudS50aXRsZSA9PT0gIkxhbmd1YWdlcyIpOwotICAgIGlmIChsYW5ndWFnZXNNZW51 Py5jaGlsZHJlbj8ubGVuZ3RoKSB7Ci0gICAgICAgIGF3YWl0IFVJSGVscGVyLmNob29zZU1lbnVB Y3Rpb24obGFuZ3VhZ2VzTWVudS50aXRsZSk7Ci0gICAgICAgIGF3YWl0IFVJSGVscGVyLmRlbGF5 Rm9yKDUwMCk7IC8vIGdpdmUgdGltZSBmb3IgdGhlIFVJTWVudSB0byBhbmltYXRlCi0gICAgfQor ICAgIGF3YWl0IGdldFRyYWNrc0NvbnRleHRNZW51KCk7CiAgICAgYXdhaXQgVUlIZWxwZXIuY2hv b3NlTWVudUFjdGlvbigiRnJlbmNoIFNvdW5kIik7CiB9CiAKIGFzeW5jIGZ1bmN0aW9uIGNsaWNr T25TcGFuaXNoQXVkaW9UcmFjaygpCiB7CiAgICAgZGVidWcoIlNlbGVjdGluZyAnU3BhbmlzaCcg dHJhY2suLi4iKTsKLSAgICBsZXQgY29udGV4dG1lbnUgPSBhd2FpdCBnZXRUcmFja3NDb250ZXh0 TWVudSgpOwotICAgIGxldCBsYW5ndWFnZXNNZW51ID0gY29udGV4dG1lbnVbMF0uY2hpbGRyZW4u ZmluZCgoc3VibWVudSkgPT4gc3VibWVudS50aXRsZSA9PT0gIkxhbmd1YWdlcyIpOwotICAgIGlm IChsYW5ndWFnZXNNZW51Py5jaGlsZHJlbj8ubGVuZ3RoKSB7Ci0gICAgICAgIGF3YWl0IFVJSGVs cGVyLmNob29zZU1lbnVBY3Rpb24obGFuZ3VhZ2VzTWVudS50aXRsZSk7Ci0gICAgICAgIGF3YWl0 IFVJSGVscGVyLmRlbGF5Rm9yKDUwMCk7IC8vIGdpdmUgdGltZSBmb3IgdGhlIFVJTWVudSB0byBh bmltYXRlCi0gICAgfQorICAgIGF3YWl0IGdldFRyYWNrc0NvbnRleHRNZW51KCk7CiAgICAgYXdh aXQgVUlIZWxwZXIuY2hvb3NlTWVudUFjdGlvbigiU3BhbmlzaCBTb3VuZCIpOwogfQogCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1 cHBvcnQvaGlkZGVuLXRyYWNrcy5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlh LWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2hpZGRlbi10cmFja3MuaHRtbAppbmRleCBkYTQ1Yjhk NDNlYzY4YmI5M2E2M2Y3YTZkZDViM2JiOGVhNzIwNmUyLi42ZjFmNTcwYzk1ZmI0M2RkYzQ0ZDkw Zjg3OWZlMzZhNDA2NzNmNGVhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4t bWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvaGlkZGVuLXRyYWNrcy5odG1sCisrKyBiL0xh eW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9oaWRk ZW4tdHJhY2tzLmh0bWwKQEAgLTMwLDEzICszMCw2IEBAIG1lZGlhLmFkZEV2ZW50TGlzdGVuZXIo InBsYXkiLCAoKSA9PiB7CiAgICAgICAgICAgICBkZWJ1ZygiVGFwcGluZyB0cmFja3MgYnV0dG9u Li4uIik7CiAgICAgICAgICAgICBhd2FpdCBwcmVzc09uRWxlbWVudChzaGFkb3dSb290LnF1ZXJ5 U2VsZWN0b3IoImJ1dHRvbi50cmFja3MiKSk7CiAgICAgICAgICAgICBjb250ZXh0bWVudSA9IGF3 YWl0IGdldFRyYWNrc0NvbnRleHRNZW51KCk7Ci0KLSAgICAgICAgICAgIGxldCBzdWJ0aXRsZXNN ZW51ID0gY29udGV4dG1lbnVbMF0uY2hpbGRyZW4uZmluZCgoc3VibWVudSkgPT4gc3VibWVudS50 aXRsZSA9PT0gIlN1YnRpdGxlcyIpOwotICAgICAgICAgICAgaWYgKHN1YnRpdGxlc01lbnU/LmNo aWxkcmVuPy5sZW5ndGgpIHsKLSAgICAgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci5jaG9vc2VN ZW51QWN0aW9uKHN1YnRpdGxlc01lbnUudGl0bGUpOwotICAgICAgICAgICAgICAgIGF3YWl0IFVJ SGVscGVyLmRlbGF5Rm9yKDUwMCk7IC8vIGdpdmUgdGltZSBmb3IgdGhlIFVJTWVudSB0byBhbmlt YXRlCi0gICAgICAgICAgICAgICAgY29udGV4dG1lbnUgPSBbc3VidGl0bGVzTWVudV07Ci0gICAg ICAgICAgICB9CiAgICAgICAgICAgICBjaGVja2VkSXRlbXMgPSBjb250ZXh0bWVudVswXS5jaGls ZHJlbi5maWx0ZXIoKGl0ZW0pID0+IGl0ZW0uY2hlY2tlZCk7CiAgICAgICAgICAgICBzaG91bGRC ZSgiY2hlY2tlZEl0ZW1zLmxlbmd0aCIsICIxIik7CiAgICAgICAgICAgICBzaG91bGRCZUVxdWFs VG9TdHJpbmcoImNoZWNrZWRJdGVtc1swXS50aXRsZSIsICJPZmYiKTsKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9vZmYt dGV4dC10cmFjay5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xz L3RyYWNrcy1zdXBwb3J0L29mZi10ZXh0LXRyYWNrLmh0bWwKaW5kZXggNTlkMzU1NzEyZDIwYWI5 YTcxZjc0M2I0MGM0NGU1MmE0OTExZDUwNy4uMWVhYzZlMzc4YTVhMTFlMzkyYzcxMmJiNmE3NTRi MDZjYTlkZjBhYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL3RyYWNrcy1zdXBwb3J0L29mZi10ZXh0LXRyYWNrLmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L29mZi10ZXh0LXRy YWNrLmh0bWwKQEAgLTI2LDEzICsyNiw2IEBAIG1lZGlhLmFkZEV2ZW50TGlzdGVuZXIoInBsYXki LCAoKSA9PiB7CiAgICAgICAgICAgICBkZWJ1ZygiVGFwcGluZyB0cmFja3MgYnV0dG9uLi4uIik7 CiAgICAgICAgICAgICBhd2FpdCBwcmVzc09uRWxlbWVudChzaGFkb3dSb290LnF1ZXJ5U2VsZWN0 b3IoImJ1dHRvbi50cmFja3MiKSk7CiAgICAgICAgICAgICBjb250ZXh0bWVudSA9IGF3YWl0IGdl dFRyYWNrc0NvbnRleHRNZW51KCk7Ci0KLSAgICAgICAgICAgIGxldCBzdWJ0aXRsZXNNZW51ID0g Y29udGV4dG1lbnVbMF0uY2hpbGRyZW4uZmluZCgoc3VibWVudSkgPT4gc3VibWVudS50aXRsZSA9 PT0gIlN1YnRpdGxlcyIpOwotICAgICAgICAgICAgaWYgKHN1YnRpdGxlc01lbnU/LmNoaWxkcmVu Py5sZW5ndGgpIHsKLSAgICAgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci5jaG9vc2VNZW51QWN0 aW9uKHN1YnRpdGxlc01lbnUudGl0bGUpOwotICAgICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVy LmRlbGF5Rm9yKDUwMCk7IC8vIGdpdmUgdGltZSBmb3IgdGhlIFVJTWVudSB0byBhbmltYXRlCi0g ICAgICAgICAgICAgICAgY29udGV4dG1lbnUgPSBbc3VidGl0bGVzTWVudV07Ci0gICAgICAgICAg ICB9CiAgICAgICAgICAgICBjaGVja2VkSXRlbXMgPSBjb250ZXh0bWVudVswXS5jaGlsZHJlbi5m aWx0ZXIoKGl0ZW0pID0+IGl0ZW0uY2hlY2tlZCk7CiAgICAgICAgICAgICBzaG91bGRCZSgiY2hl Y2tlZEl0ZW1zLmxlbmd0aCIsICIxIik7CiAgICAgICAgICAgICBzaG91bGRCZUVxdWFsVG9TdHJp bmcoImNoZWNrZWRJdGVtc1swXS50aXRsZSIsICJPZmYiKTsKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90ZXh0LXRyYWNr LXNlbGVjdGVkLXZpYS1tZWRpYS1hcGkuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1t ZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90ZXh0LXRyYWNrLXNlbGVjdGVkLXZpYS1tZWRp YS1hcGkuaHRtbAppbmRleCA2M2NiMDhkOTNlNzVlYTI2YzA5ZjIyZjViMDJiOGFlNGQzM2JhODAy Li5iMzRjNWZlZTg4ZjBlMmY1NGUxYzllNzA3OTNjMGUyMDg5MjEzY2M4IDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvdGV4 dC10cmFjay1zZWxlY3RlZC12aWEtbWVkaWEtYXBpLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvbWVk aWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L3RleHQtdHJhY2stc2VsZWN0 ZWQtdmlhLW1lZGlhLWFwaS5odG1sCkBAIC0zOSwxMyArMzksNiBAQCBtZWRpYS5hZGRFdmVudExp c3RlbmVyKCJwbGF5IiwgKCkgPT4gewogICAgICAgICAgICAgICAgIGRlYnVnKCJUYXBwaW5nIHRy YWNrcyBidXR0b24uLi4iKTsKICAgICAgICAgICAgICAgICBhd2FpdCBwcmVzc09uRWxlbWVudChz aGFkb3dSb290LnF1ZXJ5U2VsZWN0b3IoImJ1dHRvbi50cmFja3MiKSk7CiAgICAgICAgICAgICAg ICAgY29udGV4dG1lbnUgPSBhd2FpdCBnZXRUcmFja3NDb250ZXh0TWVudSgpOwotCi0gICAgICAg ICAgICAgICAgbGV0IHN1YnRpdGxlc01lbnUgPSBjb250ZXh0bWVudVswXS5jaGlsZHJlbi5maW5k KChzdWJtZW51KSA9PiBzdWJtZW51LnRpdGxlID09PSAiU3VidGl0bGVzIik7Ci0gICAgICAgICAg ICAgICAgaWYgKHN1YnRpdGxlc01lbnU/LmNoaWxkcmVuPy5sZW5ndGgpIHsKLSAgICAgICAgICAg ICAgICAgICAgYXdhaXQgVUlIZWxwZXIuY2hvb3NlTWVudUFjdGlvbihzdWJ0aXRsZXNNZW51LnRp dGxlKTsKLSAgICAgICAgICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIuZGVsYXlGb3IoNTAwKTsg Ly8gZ2l2ZSB0aW1lIGZvciB0aGUgVUlNZW51IHRvIGFuaW1hdGUKLSAgICAgICAgICAgICAgICAg ICAgY29udGV4dG1lbnUgPSBbc3VidGl0bGVzTWVudV07Ci0gICAgICAgICAgICAgICAgfQogICAg ICAgICAgICAgICAgIHNob3VsZEJlVHJ1ZSgiY29udGV4dG1lbnVJdGVtKCdFbmdsaXNoJykuY2hl Y2tlZCIpOwogICAgICAgICAgICAgICAgIHNob3VsZEJlVW5kZWZpbmVkKCJjb250ZXh0bWVudUl0 ZW0oJ0ZyZW5jaCcpLmNoZWNrZWQiKTsKIApAQCAtNjEsMTMgKzU0LDYgQEAgbWVkaWEuYWRkRXZl bnRMaXN0ZW5lcigicGxheSIsICgpID0+IHsKICAgICAgICAgICAgICAgICBkZWJ1ZygiVGFwcGlu ZyB0cmFja3MgYnV0dG9uLi4uIik7CiAgICAgICAgICAgICAgICAgYXdhaXQgcHJlc3NPbkVsZW1l bnQoc2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCJidXR0b24udHJhY2tzIikpOwogICAgICAgICAg ICAgICAgIGNvbnRleHRtZW51ID0gYXdhaXQgZ2V0VHJhY2tzQ29udGV4dE1lbnUoKTsKLQotICAg ICAgICAgICAgICAgIGxldCBzdWJ0aXRsZXNNZW51ID0gY29udGV4dG1lbnVbMF0uY2hpbGRyZW4u ZmluZCgoc3VibWVudSkgPT4gc3VibWVudS50aXRsZSA9PT0gIlN1YnRpdGxlcyIpOwotICAgICAg ICAgICAgICAgIGlmIChzdWJ0aXRsZXNNZW51Py5jaGlsZHJlbj8ubGVuZ3RoKSB7Ci0gICAgICAg ICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmNob29zZU1lbnVBY3Rpb24oc3VidGl0bGVzTWVu dS50aXRsZSk7Ci0gICAgICAgICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmRlbGF5Rm9yKDUw MCk7IC8vIGdpdmUgdGltZSBmb3IgdGhlIFVJTWVudSB0byBhbmltYXRlCi0gICAgICAgICAgICAg ICAgICAgIGNvbnRleHRtZW51ID0gW3N1YnRpdGxlc01lbnVdOwotICAgICAgICAgICAgICAgIH0K ICAgICAgICAgICAgICAgICBzaG91bGRCZVVuZGVmaW5lZCgiY29udGV4dG1lbnVJdGVtKCdFbmds aXNoJykuY2hlY2tlZCIpOwogICAgICAgICAgICAgICAgIHNob3VsZEJlVHJ1ZSgiY29udGV4dG1l bnVJdGVtKCdGcmVuY2gnKS5jaGVja2VkIik7CiAgICAgICAgICAgICB9Cg==