239018 2022-04-08 15:41:51 -0700 [Modern Media Controls] remove unnecessary `LayoutTraits` methods 2022-04-11 15:49:41 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 hi hi eric.carlson ews-watchlist glenn hi jer.noble joepeck philipj sergio webkit-bug-importer oldest_to_newest 1859915 0 hi 2022-04-08 15:41:51 -0700 . 1859916 1 hi 2022-04-08 15:42:03 -0700 <rdar://problem/91324687> 1859917 2 457122 hi 2022-04-08 15:43:10 -0700 Created attachment 457122 Patch 1860443 3 ews-feeder 2022-04-11 15:49:38 -0700 Committed r292730 (249515@main): <https://commits.webkit.org/249515@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 457122. 457122 2022-04-08 15:43:10 -0700 2022-04-11 15:49:39 -0700 Patch bug-239018-20220408164309.patch text/plain 12084 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkYmNkNWI4ZDVhNTdkNzRmMmVmNGZiZmU5ZTBmOTI4NDQwZmVkNGIxLi42 NDk2NmMwZWY5YWQ5YjFlYTg1NDkyNmQ0OTFiNjZmMDFiZjVkZjgyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsNDcgQEAKKzIwMjItMDQtMDcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFtNb2Rlcm4gTWVkaWEgQ29udHJvbHNdIHJlbW92ZSB1bm5lY2Vzc2FyeSBg TGF5b3V0VHJhaXRzYCBtZXRob2RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMzkwMTgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzkxMzI0Njg3Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTW9kdWxl cy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbGF5b3V0LXRyYWl0cy5qczoKKyAgICAg ICAgKExheW91dFRyYWl0cy5wcm90b3R5cGUua25vYlN0eWxlRm9yU2NydWJiZXIpOiBEZWxldGVk LgorICAgICAgICAoTGF5b3V0VHJhaXRzLnByb3RvdHlwZS5wbGF5UGF1c2VCdXR0b25TY2FsZUZh Y3Rvcik6IERlbGV0ZWQuCisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMv Y29udHJvbHMvaW9zLWxheW91dC10cmFpdHMuanM6CisgICAgICAgIChJT1NMYXlvdXRUcmFpdHMu cHJvdG90eXBlLmtub2JTdHlsZUZvclNjcnViYmVyKTogRGVsZXRlZC4KKyAgICAgICAgKElPU0xh eW91dFRyYWl0cy5wcm90b3R5cGUucGxheVBhdXNlQnV0dG9uU2NhbGVGYWN0b3IpOiBEZWxldGVk LgorICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL21hY29z LWxheW91dC10cmFpdHMuanM6CisgICAgICAgIChNYWNPU0xheW91dFRyYWl0cy5wcm90b3R5cGUu a25vYlN0eWxlRm9yU2NydWJiZXIpOiBEZWxldGVkLgorICAgICAgICAoTWFjT1NMYXlvdXRUcmFp dHMucHJvdG90eXBlLnBsYXlQYXVzZUJ1dHRvblNjYWxlRmFjdG9yKTogRGVsZXRlZC4KKyAgICAg ICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy93YXRjaG9zLWxheW91 dC10cmFpdHMuanM6CisgICAgICAgIChXYXRjaE9TTGF5b3V0VHJhaXRzLnByb3RvdHlwZS5rbm9i U3R5bGVGb3JTY3J1YmJlcik6IERlbGV0ZWQuCisgICAgICAgIChXYXRjaE9TTGF5b3V0VHJhaXRz LnByb3RvdHlwZS5wbGF5UGF1c2VCdXR0b25TY2FsZUZhY3Rvcik6IERlbGV0ZWQuCisgICAgICAg ICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbWFjb3MtZnVsbHNjcmVl bi1tZWRpYS1jb250cm9scy5qczoKKyAgICAgICAgKE1hY09TRnVsbHNjcmVlbk1lZGlhQ29udHJv bHMpOgorICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL21h Y29zLWlubGluZS1tZWRpYS1jb250cm9scy5qczoKKyAgICAgICAgKE1hY09TSW5saW5lTWVkaWFD b250cm9scyk6CisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJv bHMvcGxheS1wYXVzZS1idXR0b24uanM6CisgICAgICAgIChQbGF5UGF1c2VCdXR0b24pOgorICAg ICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL3RpbWUtY29udHJv bC5qczoKKyAgICAgICAgKFRpbWVDb250cm9sKToKKyAgICAgICAgUmVtb3ZlIHRoZXNlIGZ1bmN0 aW9ucyBhcyB0aGV5IGFyZSBtdWNoIG1vcmUgY29udHJvbGxhYmxlIGJ5IGhhdmluZyB0aGUgYE1l ZGlhQ29udHJvbHNgCisgICAgICAgIHN1YmNsYXNzIHNldCB0aGUgcmVsYXRlZCBwcm9wZXJ0eSBk aXJlY3RseS4gSGF2aW5nIHRoZW0gYmUgb24gYExheW91dFRyYWl0c2AgYWxzbyBtYWtlcyBpdAor ICAgICAgICBtb3JlIGRpZmZpY3VsdCB0byBoYW5kbGUgc2l0dWF0aW9ucyB3aGVyZSB0aGUgc3Rh dGUgb2YgdGhlIGBNZWRpYUNvbnRyb2xzYCBpbmZsdWVuY2VzIHRoZQorICAgICAgICB2YWx1ZSBn aXZlbiB0byB0aGUgcHJvcGVydHkgKGUuZy4gd2hldGhlciB0byB1c2UgdGhlIHZpZGVvIG9yIGF1 ZGlvIGxheW91dCkuCisKKyAgICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9j b250cm9scy9idXR0b25zLWNvbnRhaW5lci5qczoKKyAgICAgICAgKEJ1dHRvbnNDb250YWluZXIp OgorICAgICAgICBFeHBvc2UgdGhlIGRlZmF1bHQgdmFsdWUgb2YgYGxlZnRNYXJnaW5gLCBgcmln aHRNYXJnaW5gLCBhbmQgYGJ1dHRvbk1hcmdpbmAgc28gdGhhdCBpZiB0aGUKKyAgICAgICAgYE1l ZGlhQ29udHJvbHNgIHdhbnRzIHRvIHJlc2V0IG9uZSBvZiB0aGUgYWJvdmUgb3ZlcnJpZGVzLCBp dCBkb2Vzbid0IG5lZWQgYSBtYWdpYyBudW1iZXIuCisKKyAgICAgICAgKiBNb2R1bGVzL21vZGVy bi1tZWRpYS1jb250cm9scy9jb250cm9scy9zbGlkZXIuanM6CisgICAgICAgIChTbGlkZXIucHJv dG90eXBlLmdldCBrbm9iU3R5bGUpOiBBZGRlZC4KKyAgICAgICAgKFNsaWRlci5wcm90b3R5cGUu c2V0IGtub2JTdHlsZSk6IEFkZGVkLgorICAgICAgICBQcm92aWRlIGEgd2F5IHRvIGNoYW5nZSB0 aGUgYGtub2JTdHlsZWAgYWZ0ZXIgY29uc3RydWN0aW9uIGluIGNhc2UgdGhlIGBNZWRpYUNvbnRy b2xzYCBzdGF0ZQorICAgICAgICBjaGFuZ2VzLgorCiAyMDIyLTA0LTA3ICBOaWtvbGFzIFppbW1l cm1hbm4gIDxuemltbWVybWFubkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVuaWZ5IHJlZmVyZW5j ZSBib3ggLyBDVE0gY29tcHV0YXRpb24gaW4gUmVuZGVyTGF5ZXIKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2J1dHRvbnMt Y29udGFpbmVyLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJv bHMvY29udHJvbHMvYnV0dG9ucy1jb250YWluZXIuanMKaW5kZXggN2IyNzBjYzlhYTE5MzkxZmU4 ODdkNzI4Njg1NmExMDMyOWU4MWIwYy4uNWRlYTRkNTg2MTA2OWY4NjJlYzQyYjI1YzA4ZjQ0Mzcx Y2VhNzY4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEt Y29udHJvbHMvY29udHJvbHMvYnV0dG9ucy1jb250YWluZXIuanMKKysrIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvYnV0dG9ucy1jb250YWlu ZXIuanMKQEAgLTI2LDE2ICsyNiwyNCBAQAogY2xhc3MgQnV0dG9uc0NvbnRhaW5lciBleHRlbmRz IExheW91dE5vZGUKIHsKIAotICAgIGNvbnN0cnVjdG9yKHsgY2hpbGRyZW4gPSBbXSwgbGVmdE1h cmdpbiA9IDE2LCByaWdodE1hcmdpbiA9IDE2LCBidXR0b25NYXJnaW4gPSAxNiwgY3NzQ2xhc3NO YW1lID0gIiIgfSA9IHt9KQorICAgIGNvbnN0cnVjdG9yKHsgY2hpbGRyZW4sIGxlZnRNYXJnaW4s IHJpZ2h0TWFyZ2luLCBidXR0b25NYXJnaW4sIGNzc0NsYXNzTmFtZSB9ID0ge30pCiAgICAgewot ICAgICAgICBzdXBlcihgPGRpdiBjbGFzcz0iYnV0dG9ucy1jb250YWluZXIgJHtjc3NDbGFzc05h bWV9Ij48L2Rpdj5gKTsKKyAgICAgICAgc3VwZXIoYDxkaXYgY2xhc3M9ImJ1dHRvbnMtY29udGFp bmVyICR7Y3NzQ2xhc3NOYW1lID8/ICIifSI+PC9kaXY+YCk7CiAKLSAgICAgICAgdGhpcy5sZWZ0 TWFyZ2luID0gbGVmdE1hcmdpbjsKLSAgICAgICAgdGhpcy5yaWdodE1hcmdpbiA9IHJpZ2h0TWFy Z2luOwotICAgICAgICB0aGlzLmJ1dHRvbk1hcmdpbiA9IGJ1dHRvbk1hcmdpbjsKLSAgICAgICAg dGhpcy5jaGlsZHJlbiA9IGNoaWxkcmVuOworICAgICAgICB0aGlzLmxlZnRNYXJnaW4gPSBsZWZ0 TWFyZ2luID8/IEJ1dHRvbnNDb250YWluZXIuRGVmYXVsdHMuTGVmdE1hcmdpbjsKKyAgICAgICAg dGhpcy5yaWdodE1hcmdpbiA9IHJpZ2h0TWFyZ2luID8/IEJ1dHRvbnNDb250YWluZXIuRGVmYXVs dHMuUmlnaHRNYXJnaW47CisgICAgICAgIHRoaXMuYnV0dG9uTWFyZ2luID0gYnV0dG9uTWFyZ2lu ID8/IEJ1dHRvbnNDb250YWluZXIuRGVmYXVsdHMuQnV0dG9uTWFyZ2luOworICAgICAgICB0aGlz LmNoaWxkcmVuID0gY2hpbGRyZW4gPz8gW107CiAgICAgfQogCisgICAgLy8gU3RhdGljCisKKyAg ICBzdGF0aWMgRGVmYXVsdHMgPSB7CisgICAgICAgIExlZnRNYXJnaW46IDE2LAorICAgICAgICBS aWdodE1hcmdpbjogMTYsCisgICAgICAgIEJ1dHRvbk1hcmdpbjogMTYsCisgICAgfTsKKwogICAg IC8vIFB1YmxpYwogCiAgICAgd2lsbFJlbW92ZUNoaWxkKGNoaWxkKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvaW9zLWxh eW91dC10cmFpdHMuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250 cm9scy9jb250cm9scy9pb3MtbGF5b3V0LXRyYWl0cy5qcwppbmRleCAzZWJhNDUxODkyNzZlYTI3 ODcxZGNjNDgzMzNkNGUzYjFhODQ5OWYwLi5jMmU4YmViODQyNjkwZDcyYzRlZmE4NTFmYWM0MTdh YzMxMTJiMzRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRp YS1jb250cm9scy9jb250cm9scy9pb3MtbGF5b3V0LXRyYWl0cy5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9pb3MtbGF5b3V0LXRy YWl0cy5qcwpAQCAtNTUsMjEgKzU1LDExIEBAIGNsYXNzIElPU0xheW91dFRyYWl0cyBleHRlbmRz IExheW91dFRyYWl0cwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCi0gICAga25vYlN0 eWxlRm9yU2NydWJiZXIoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIFNsaWRlci5Lbm9iU3R5bGUu Q2lyY2xlOwotICAgIH0KLQogICAgIHN1cHBvcnRzRHVyYXRpb25UaW1lTGFiZWwoKQogICAgIHsK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAotICAgIHBsYXlQYXVzZUJ1dHRvblNjYWxl RmFjdG9yKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiAxOwotICAgIH0KLQogICAgIGNvbnRyb2xz RGVwZW5kT25QYWdlU2NhbGVGYWN0b3IoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRydWU7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9j b250cm9scy9sYXlvdXQtdHJhaXRzLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4t bWVkaWEtY29udHJvbHMvY29udHJvbHMvbGF5b3V0LXRyYWl0cy5qcwppbmRleCA2ZmU0ZWJmMjMy NmYyNTJjMzMwZmIwNGNmZThlYjM5NjdkODU1ZmEzLi4zYjgxYTdmMjVlM2MwNDljNjIzY2NiZTJj ZGRmZDBmYTM4ZjVlOGYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVy bi1tZWRpYS1jb250cm9scy9jb250cm9scy9sYXlvdXQtdHJhaXRzLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2xheW91dC10cmFp dHMuanMKQEAgLTY2LDIxICs2NiwxMSBAQCBjbGFzcyBMYXlvdXRUcmFpdHMKICAgICAgICAgdGhy b3cgIkRlcml2ZWQgY2xhc3MgbXVzdCBpbXBsZW1lbnQgdGhpcyBmdW5jdGlvbi4iOwogICAgIH0K IAotICAgIGtub2JTdHlsZUZvclNjcnViYmVyKCkKLSAgICB7Ci0gICAgICAgIHRocm93ICJEZXJp dmVkIGNsYXNzIG11c3QgaW1wbGVtZW50IHRoaXMgZnVuY3Rpb24uIjsKLSAgICB9Ci0KICAgICBz dXBwb3J0c0R1cmF0aW9uVGltZUxhYmVsKCkKICAgICB7CiAgICAgICAgIHRocm93ICJEZXJpdmVk IGNsYXNzIG11c3QgaW1wbGVtZW50IHRoaXMgZnVuY3Rpb24uIjsKICAgICB9CiAKLSAgICBwbGF5 UGF1c2VCdXR0b25TY2FsZUZhY3RvcigpCi0gICAgewotICAgICAgICB0aHJvdyAiRGVyaXZlZCBj bGFzcyBtdXN0IGltcGxlbWVudCB0aGlzIGZ1bmN0aW9uLiI7Ci0gICAgfQotCiAgICAgY29udHJv bHNEZXBlbmRPblBhZ2VTY2FsZUZhY3RvcigpCiAgICAgewogICAgICAgICB0aHJvdyAiRGVyaXZl ZCBjbGFzcyBtdXN0IGltcGxlbWVudCB0aGlzIGZ1bmN0aW9uLiI7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9tYWNvcy1m dWxsc2NyZWVuLW1lZGlhLWNvbnRyb2xzLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rl cm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbWFjb3MtZnVsbHNjcmVlbi1tZWRpYS1jb250cm9s cy5qcwppbmRleCAzMjI2NzdjMDMyZWQ2YzYyMDE3M2JlOTczZDBhMDVhZTNiNDYxMzY4Li5hMjA1 YWFhZWRkODQyYWY4YzMwYTcyMWUxYzJmMTVhNDRiZGExYjY1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9tYWNvcy1mdWxs c2NyZWVuLW1lZGlhLWNvbnRyb2xzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9k ZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL21hY29zLWZ1bGxzY3JlZW4tbWVkaWEtY29udHJv bHMuanMKQEAgLTM3LDYgKzM3LDEwIEBAIGNsYXNzIE1hY09TRnVsbHNjcmVlbk1lZGlhQ29udHJv bHMgZXh0ZW5kcyBNZWRpYUNvbnRyb2xzCiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3Qu YWRkKCJtYWMiKTsKICAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImZ1bGxzY3Jl ZW4iKTsKIAorICAgICAgICB0aGlzLnRpbWVDb250cm9sLnNjcnViYmVyLmtub2JTdHlsZSA9IFNs aWRlci5Lbm9iU3R5bGUuQmFyOworCisgICAgICAgIHRoaXMucGxheVBhdXNlQnV0dG9uLnNjYWxl RmFjdG9yID0gMjsKKwogICAgICAgICAvLyBTZXQgdXAgZnVsbHNjcmVlbi1zcGVjaWZpYyBidXR0 b25zLgogICAgICAgICB0aGlzLnJld2luZEJ1dHRvbiA9IG5ldyBSZXdpbmRCdXR0b24odGhpcyk7 CiAgICAgICAgIHRoaXMuZm9yd2FyZEJ1dHRvbiA9IG5ldyBGb3J3YXJkQnV0dG9uKHRoaXMpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMv Y29udHJvbHMvbWFjb3MtaW5saW5lLW1lZGlhLWNvbnRyb2xzLmpzIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbWFjb3MtaW5saW5lLW1lZGlh LWNvbnRyb2xzLmpzCmluZGV4IGRmNzczZWJlYmJmMDZkNzRkMTg0NjM0ZGFkNzI0MTRmZGU1YTlj YzYuLmNjN2M4YTIxODgwOGIyMjcyNzEwNjY3MzRiZDgzOWZjOTNmMzg3NjIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL21h Y29zLWlubGluZS1tZWRpYS1jb250cm9scy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9tYWNvcy1pbmxpbmUtbWVkaWEtY29udHJv bHMuanMKQEAgLTM2LDYgKzM2LDggQEAgY2xhc3MgTWFjT1NJbmxpbmVNZWRpYUNvbnRyb2xzIGV4 dGVuZHMgSW5saW5lTWVkaWFDb250cm9scwogCiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xp c3QuYWRkKCJtYWMiKTsKIAorICAgICAgICB0aGlzLnRpbWVDb250cm9sLnNjcnViYmVyLmtub2JT dHlsZSA9IFNsaWRlci5Lbm9iU3R5bGUuQmFyOworCiAgICAgICAgIHRoaXMuX2JhY2tncm91bmRD bGlja0RlbGVnYXRlTm90aWZpZXIgPSBuZXcgQmFja2dyb3VuZENsaWNrRGVsZWdhdGVOb3RpZmll cih0aGlzKTsKIAogICAgICAgICB0aGlzLnZvbHVtZVNsaWRlciA9IG5ldyBTbGlkZXIoInZvbHVt ZSIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29u dHJvbHMvY29udHJvbHMvbWFjb3MtbGF5b3V0LXRyYWl0cy5qcyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL21hY29zLWxheW91dC10cmFpdHMu anMKaW5kZXggMDk3M2UxNzU1OTNmMDU2MTUzNjFjMGVmYWMxN2JiZTgwNzgxZTZhMC4uZTJjMWY1 MTcwNjMxZTAzYzkwODFlYTMyZmFhMjdmOTY5MTVkNzU3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbWFjb3MtbGF5b3V0 LXRyYWl0cy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250 cm9scy9jb250cm9scy9tYWNvcy1sYXlvdXQtdHJhaXRzLmpzCkBAIC01NywyMSArNTcsMTEgQEAg Y2xhc3MgTWFjT1NMYXlvdXRUcmFpdHMgZXh0ZW5kcyBMYXlvdXRUcmFpdHMKICAgICAgICAgcmV0 dXJuIHRoaXMuaXNGdWxsc2NyZWVuOwogICAgIH0KIAotICAgIGtub2JTdHlsZUZvclNjcnViYmVy KCkKLSAgICB7Ci0gICAgICAgIHJldHVybiBTbGlkZXIuS25vYlN0eWxlLkJhcjsKLSAgICB9Ci0K ICAgICBzdXBwb3J0c0R1cmF0aW9uVGltZUxhYmVsKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0 cnVlOwogICAgIH0KIAotICAgIHBsYXlQYXVzZUJ1dHRvblNjYWxlRmFjdG9yKCkKLSAgICB7Ci0g ICAgICAgIHJldHVybiB0aGlzLmlzRnVsbHNjcmVlbiA/IDIgOiAxOwotICAgIH0KLQogICAgIGNv bnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IoKQogICAgIHsKICAgICAgICAgcmV0dXJuIGZh bHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29u dHJvbHMvY29udHJvbHMvcGxheS1wYXVzZS1idXR0b24uanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9wbGF5LXBhdXNlLWJ1dHRvbi5qcwpp bmRleCBkYjZjNTM3NDJkNWFkODdkZmQ4MmQyNTIwMjIzYWJmYmI4OTVkN2FlLi5mN2JiN2UzZjJj Y2IxNjc0ZjI0ZGZlZmRjNGJiNTkzMDE3N2YzOGVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9wbGF5LXBhdXNlLWJ1dHRv bi5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9j b250cm9scy9wbGF5LXBhdXNlLWJ1dHRvbi5qcwpAQCAtMzMsOCArMzMsNiBAQCBjbGFzcyBQbGF5 UGF1c2VCdXR0b24gZXh0ZW5kcyBCdXR0b24KICAgICAgICAgICAgIGljb25OYW1lOiBJY29ucy5Q bGF5LAogICAgICAgICAgICAgbGF5b3V0RGVsZWdhdGUKICAgICAgICAgfSk7Ci0KLSAgICAgICAg dGhpcy5zY2FsZUZhY3RvciA9IHRoaXMubGF5b3V0VHJhaXRzLnBsYXlQYXVzZUJ1dHRvblNjYWxl RmFjdG9yKCk7CiAgICAgfQogCiAgICAgLy8gUHVibGljCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9zbGlkZXIuanMgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9zbGlk ZXIuanMKaW5kZXggYzk0OWQxMGRjYTBiNWQ1YWJmOWNiNzZjNGI3NGEzOGMxOTk3OTgwNC4uNmJm ZmNmMmFjNGM4NGEwNzkyMDU4NjE2NmRiZjdkZjgyOTM5ODAxNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvc2xpZGVyLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRy b2xzL3NsaWRlci5qcwpAQCAtMTA1LDYgKzEwNSwyNSBAQCBjbGFzcyBTbGlkZXIgZXh0ZW5kcyBM YXlvdXROb2RlCiAgICAgICAgIHRoaXMubmVlZHNMYXlvdXQgPSB0cnVlOwogICAgIH0KIAorICAg IGdldCBrbm9iU3R5bGUoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2tub2JTdHlsZTsK KyAgICB9CisKKyAgICBzZXQga25vYlN0eWxlKGtub2JTdHlsZSkKKyAgICB7CisgICAgICAgIGlm ICh0aGlzLl9rbm9iU3R5bGUgPT09IGtub2JTdHlsZSkKKyAgICAgICAgICAgIHJldHVybjsKKwor ICAgICAgICB0aGlzLl9rbm9iLmVsZW1lbnQuY2xhc3NMaXN0LnJlbW92ZSh0aGlzLl9rbm9iU3R5 bGUpOworCisgICAgICAgIHRoaXMuX2tub2JTdHlsZSA9IGtub2JTdHlsZTsKKworICAgICAgICB0 aGlzLl9rbm9iLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCh0aGlzLl9rbm9iU3R5bGUpOworCisgICAg ICAgIHRoaXMubmVlZHNMYXlvdXQgPSB0cnVlOworICAgIH0KKwogICAgIC8vIFByb3RlY3RlZAog CiAgICAgaGFuZGxlRXZlbnQoZXZlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy90aW1lLWNvbnRyb2wuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy90aW1lLWNv bnRyb2wuanMKaW5kZXggMzVjNWZlNmM5ZjQ0OTdjYTFkNTkzY2U0MTdjYmNhZmM0YWI3Mjg3MC4u ZTQ3ZDRjNTFjNWRkNWNmZWZkYzQxOGRkZjQ3NTQ1Nzg0MDRlYjFmNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvdGltZS1j b250cm9sLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRy b2xzL2NvbnRyb2xzL3RpbWUtY29udHJvbC5qcwpAQCAtNDIsNyArNDIsNyBAQCBjbGFzcyBUaW1l Q29udHJvbCBleHRlbmRzIExheW91dEl0ZW0KICAgICAgICAgdGhpcy5fc2hvdWxkU2hvd0R1cmF0 aW9uVGltZUxhYmVsID0gdGhpcy5sYXlvdXRUcmFpdHMuc3VwcG9ydHNEdXJhdGlvblRpbWVMYWJl bCgpOwogCiAgICAgICAgIHRoaXMuZWxhcHNlZFRpbWVMYWJlbCA9IG5ldyBUaW1lTGFiZWwoVGlt ZUxhYmVsLlR5cGUuRWxhcHNlZCk7Ci0gICAgICAgIHRoaXMuc2NydWJiZXIgPSBuZXcgU2xpZGVy KCJzY3J1YmJlciIsIHRoaXMubGF5b3V0VHJhaXRzLmtub2JTdHlsZUZvclNjcnViYmVyKCkpOwor ICAgICAgICB0aGlzLnNjcnViYmVyID0gbmV3IFNsaWRlcigic2NydWJiZXIiKTsKICAgICAgICAg aWYgKHRoaXMuX3Nob3VsZFNob3dEdXJhdGlvblRpbWVMYWJlbCkKICAgICAgICAgICAgIHRoaXMu ZHVyYXRpb25UaW1lTGFiZWwgPSBuZXcgVGltZUxhYmVsKFRpbWVMYWJlbC5UeXBlLkR1cmF0aW9u KTsKICAgICAgICAgdGhpcy5yZW1haW5pbmdUaW1lTGFiZWwgPSBuZXcgVGltZUxhYmVsKFRpbWVM YWJlbC5UeXBlLlJlbWFpbmluZyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy93YXRjaG9zLWxheW91dC10cmFpdHMuanMg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy93 YXRjaG9zLWxheW91dC10cmFpdHMuanMKaW5kZXggZGNmYmVkNmVlNzA0Y2Q3NjAwMmQ2MzUxMWMw NzUxZDA4MGZkYWI5MC4uODcwMTJkYmUzMmI4NDcxOGNmMDFlNDU3NGZhZmJkNWZmOGEwZTliNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMv Y29udHJvbHMvd2F0Y2hvcy1sYXlvdXQtdHJhaXRzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL3dhdGNob3MtbGF5b3V0LXRyYWl0 cy5qcwpAQCAtNTUsMjEgKzU1LDExIEBAIGNsYXNzIFdhdGNoT1NMYXlvdXRUcmFpdHMgZXh0ZW5k cyBMYXlvdXRUcmFpdHMKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAotICAgIGtub2JT dHlsZUZvclNjcnViYmVyKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiBTbGlkZXIuS25vYlN0eWxl LkNpcmNsZTsKLSAgICB9Ci0KICAgICBzdXBwb3J0c0R1cmF0aW9uVGltZUxhYmVsKCkKICAgICB7 CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKLSAgICBwbGF5UGF1c2VCdXR0b25TY2Fs ZUZhY3RvcigpCi0gICAgewotICAgICAgICByZXR1cm4gMTsKLSAgICB9Ci0KICAgICBjb250cm9s c0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKCkKICAgICB7CiAgICAgICAgIHJldHVybiBmYWxzZTsK