190403 2018-10-09 10:30:08 -0700 Web Inspector: REGRESSION: fix canvas test failures after r236952 and r236954 2018-10-09 12:07:35 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 190305 190325 1 hi hi commit-queue inspector-bugzilla-changes joepeck justin_fan webkit-bug-importer oldest_to_newest 1467448 0 hi 2018-10-09 10:30:08 -0700 Related bugs: - <https://webkit.org/b/190305> - <https://webkit.org/b/190325> 1467451 1 351888 hi 2018-10-09 10:34:05 -0700 Created attachment 351888 Patch 1467454 2 351888 joepeck 2018-10-09 10:40:04 -0700 Comment on attachment 351888 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=351888&action=review r=me > LayoutTests/inspector/canvas/resources/shaderProgram-utilities.js:78 > + // This can't use `awaitEvent` since the promise resolution happens on the next tick.sss Whats up with the "tick.sss" at the end of this sentence? Just a typo? 1467463 3 351888 hi 2018-10-09 10:43:28 -0700 Comment on attachment 351888 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=351888&action=review >> LayoutTests/inspector/canvas/resources/shaderProgram-utilities.js:78 >> + // This can't use `awaitEvent` since the promise resolution happens on the next tick.sss > > Whats up with the "tick.sss" at the end of this sentence? Just a typo? That was my attempt at Cmd+S on the bus 😅 1467464 4 351893 hi 2018-10-09 10:44:01 -0700 Created attachment 351893 Patch 1467505 5 351893 commit-queue 2018-10-09 12:04:25 -0700 Comment on attachment 351893 Patch Clearing flags on attachment: 351893 Committed r236972: <https://trac.webkit.org/changeset/236972> 1467506 6 commit-queue 2018-10-09 12:04:27 -0700 All reviewed patches have been landed. Closing bug. 1467509 7 webkit-bug-importer 2018-10-09 12:07:35 -0700 <rdar://problem/45134558> 351888 2018-10-09 10:34:05 -0700 2018-10-09 10:44:01 -0700 Patch 190403.diff text/plain 6034 hi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1YzAwM2E4ZDUwZC4uNjAzMDRhMzcyYTUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAor MjAxOC0xMC0wOSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAg V2ViIEluc3BlY3RvcjogUkVHUkVTU0lPTjogZml4IGNhbnZhcyB0ZXN0IGZhaWx1cmVzIGFmdGVy IHIyMzY5NTIgYW5kIHIyMzY5NTQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5MDQwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogaW5zcGVjdG9yL2NhbnZhcy9jcmVhdGUtY29udGV4dC13ZWJtZXRhbC5o dG1sOgorICAgICAgICBGaXggbWlzc2luZyBwYXJlbnRoZXNpcy4KKworICAgICAgICAqIGluc3Bl Y3Rvci9jYW52YXMvcmVzb3VyY2VzL3NoYWRlclByb2dyYW0tdXRpbGl0aWVzLmpzOgorICAgICAg ICAoY3JlYXRlUHJvZ3JhbSk6CisgICAgICAgIChUZXN0UGFnZS5yZWdpc3RlckluaXRpYWxpemVy LmF3YWl0UHJvZ3JhbUFkZGVkKToKKyAgICAgICAgKFRlc3RQYWdlLnJlZ2lzdGVySW5pdGlhbGl6 ZXIpOgorICAgICAgICAoVGVzdFBhZ2UucmVnaXN0ZXJJbml0aWFsaXplci53aW5kb3cuaW5pdGlh bGl6ZVRlc3RTdWl0ZSk6CisgICAgICAgIFJlcGxhY2UgdGhlIGBXSS5DYW52YXNNYW5hZ2VyYCBl dmVudHMgKHdoaWNoIHdlcmUgcmVtb3ZlZCkgd2l0aCBsaXN0ZW5lcnMgZm9yIGV2ZW50cyBvbiB0 aGUKKyAgICAgICAgc3BlY2lmaWMgYFdJLkNhbnZhc2AuCisKIDIwMTgtMTAtMDggIERldmluIFJv dXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHNob3cg cmVkaXJlY3QgcmVxdWVzdHMgaW4gTmV0d29yayBhbmQgVGltZWxpbmVzIHRhYnMKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9jYW52YXMvY3JlYXRlLWNvbnRleHQtd2VibWV0YWwu aHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jYW52YXMvY3JlYXRlLWNvbnRleHQtd2VibWV0 YWwuaHRtbAppbmRleCA4ZTZlNWZjZDFkNi4uZmI0MTE0MzA1ZmIgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci9jYW52YXMvY3JlYXRlLWNvbnRleHQtd2VibWV0YWwuaHRtbAorKysg Yi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY2FudmFzL2NyZWF0ZS1jb250ZXh0LXdlYm1ldGFsLmh0 bWwKQEAgLTIzLDcgKzIzLDcgQEAgZnVuY3Rpb24gdGVzdCgpIHsKICAgICAgICAgY29udGV4dFR5 cGU6IFdJLkNhbnZhcy5Db250ZXh0VHlwZS5XZWJNZXRhbCwKICAgICB9KTsKIAotICAgIGFkZENT U0NhbnZhc1Rlc3RDYXNlKFdJLkNhbnZhcy5Db250ZXh0VHlwZS5XZWJNZXRhbDsKKyAgICBhZGRD U1NDYW52YXNUZXN0Q2FzZShXSS5DYW52YXMuQ29udGV4dFR5cGUuV2ViTWV0YWwpOwogCiAgICAg c3VpdGUucnVuVGVzdENhc2VzQW5kRmluaXNoKCk7CiB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvY2FudmFzL3Jlc291cmNlcy9zaGFkZXJQcm9ncmFtLXV0aWxpdGllcy5qcyBi L0xheW91dFRlc3RzL2luc3BlY3Rvci9jYW52YXMvcmVzb3VyY2VzL3NoYWRlclByb2dyYW0tdXRp bGl0aWVzLmpzCmluZGV4IGExMTUyMWU1ZTQ5Li45M2ViYjM3ODIyYSAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2NhbnZhcy9yZXNvdXJjZXMvc2hhZGVyUHJvZ3JhbS11dGlsaXRp ZXMuanMKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NhbnZhcy9yZXNvdXJjZXMvc2hhZGVy UHJvZ3JhbS11dGlsaXRpZXMuanMKQEAgLTIsNyArMiw5IEBAIGxldCBjb250ZXh0OwogbGV0IHBy b2dyYW07CiAKIGZ1bmN0aW9uIGNyZWF0ZVByb2dyYW0oY29udGV4dFR5cGUpIHsKLSAgICBjb250 ZXh0ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiY2FudmFzIikuZ2V0Q29udGV4dChjb250ZXh0 VHlwZSk7CisgICAgaWYgKCFjb250ZXh0KQorICAgICAgICBjb250ZXh0ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiY2FudmFzIikuZ2V0Q29udGV4dChjb250ZXh0VHlwZSk7CisKICAgICBwcm9n cmFtID0gY29udGV4dC5jcmVhdGVQcm9ncmFtKCk7CiB9CiAKQEAgLTQ1LDkgKzQ3LDEwIEBAIFRl c3RQYWdlLnJlZ2lzdGVySW5pdGlhbGl6ZXIoKCkgPT4gewogICAgIGxldCBzdWl0ZSA9IG51bGw7 CiAKICAgICBmdW5jdGlvbiBhd2FpdFByb2dyYW1BZGRlZCgpIHsKLSAgICAgICAgcmV0dXJuIFdJ LmNhbnZhc01hbmFnZXIuYXdhaXRFdmVudChXSS5DYW52YXNNYW5hZ2VyLkV2ZW50LlNoYWRlclBy b2dyYW1BZGRlZCkKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQoV0kuY2FudmFzTWFuYWdl ci5jYW52YXNlcy5sZW5ndGggPT09IDEsICJUaGVyZSBzaG91bGQgb25seSBiZSBvbmUgY2FudmFz LiIpOworICAgICAgICByZXR1cm4gV0kuY2FudmFzTWFuYWdlci5jYW52YXNlc1swXS5zaGFkZXJQ cm9ncmFtQ29sbGVjdGlvbi5hd2FpdEV2ZW50KFdJLkNvbGxlY3Rpb24uRXZlbnQuSXRlbUFkZGVk KQogICAgICAgICAudGhlbigoZXZlbnQpID0+IHsKLSAgICAgICAgICAgIGxldCBwcm9ncmFtID0g ZXZlbnQuZGF0YS5wcm9ncmFtOworICAgICAgICAgICAgbGV0IHByb2dyYW0gPSBldmVudC5kYXRh Lml0ZW07CiAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQocHJvZ3JhbSBpbnN0 YW5jZW9mIFdJLlNoYWRlclByb2dyYW0sICJBZGRlZCBTaGFkZXJQcm9ncmFtLiIpOwogICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KHByb2dyYW0uY2FudmFzIGluc3RhbmNlb2Yg V0kuQ2FudmFzLCAiU2hhZGVyUHJvZ3JhbSBzaG91bGQgaGF2ZSBhIHBhcmVudCBDYW52YXMuIik7 CiAgICAgICAgICAgICByZXR1cm4gcHJvZ3JhbTsKQEAgLTU1LDkgKzU4LDEwIEBAIFRlc3RQYWdl LnJlZ2lzdGVySW5pdGlhbGl6ZXIoKCkgPT4gewogICAgIH0KIAogICAgIGZ1bmN0aW9uIGF3YWl0 UHJvZ3JhbVJlbW92ZWQoKSB7Ci0gICAgICAgIHJldHVybiBXSS5jYW52YXNNYW5hZ2VyLmF3YWl0 RXZlbnQoV0kuQ2FudmFzTWFuYWdlci5FdmVudC5TaGFkZXJQcm9ncmFtUmVtb3ZlZCkKKyAgICAg ICAgSW5zcGVjdG9yVGVzdC5hc3NlcnQoV0kuY2FudmFzTWFuYWdlci5jYW52YXNlcy5sZW5ndGgg PT09IDEsICJUaGVyZSBzaG91bGQgb25seSBiZSBvbmUgY2FudmFzLiIpOworICAgICAgICByZXR1 cm4gV0kuY2FudmFzTWFuYWdlci5jYW52YXNlc1swXS5zaGFkZXJQcm9ncmFtQ29sbGVjdGlvbi5h d2FpdEV2ZW50KFdJLkNvbGxlY3Rpb24uRXZlbnQuSXRlbVJlbW92ZWQpCiAgICAgICAgIC50aGVu KChldmVudCkgPT4gewotICAgICAgICAgICAgbGV0IHByb2dyYW0gPSBldmVudC5kYXRhLnByb2dy YW07CisgICAgICAgICAgICBsZXQgcHJvZ3JhbSA9IGV2ZW50LmRhdGEuaXRlbTsKICAgICAgICAg ICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChwcm9ncmFtIGluc3RhbmNlb2YgV0kuU2hhZGVy UHJvZ3JhbSwgIlJlbW92ZWQgU2hhZGVyUHJvZ3JhbS4iKTsKICAgICAgICAgICAgIEluc3BlY3Rv clRlc3QuZXhwZWN0VGhhdChwcm9ncmFtLmNhbnZhcyBpbnN0YW5jZW9mIFdJLkNhbnZhcywgIlNo YWRlclByb2dyYW0gc2hvdWxkIGhhdmUgYSBwYXJlbnQgQ2FudmFzLiIpOwogICAgICAgICAgICAg cmV0dXJuIHByb2dyYW07CkBAIC03MSw3ICs3NSwxMCBAQCBUZXN0UGFnZS5yZWdpc3RlckluaXRp YWxpemVyKCgpID0+IHsKICAgICAgICAgICAgIG5hbWU6IGAke3N1aXRlLm5hbWV9LnJlbG9hZFBh Z2VgLAogICAgICAgICAgICAgZGVzY3JpcHRpb246ICJDaGVjayB0aGF0IFNoYWRlclByb2dyYW1B ZGRlZCBpcyBzZW50IGZvciBhIHByb2dyYW0gY3JlYXRlZCBiZWZvcmUgQ2FudmFzQWdlbnQgaXMg ZW5hYmxlZC4iLAogICAgICAgICAgICAgdGVzdChyZXNvbHZlLCByZWplY3QpIHsKLSAgICAgICAg ICAgICAgICBhd2FpdFByb2dyYW1BZGRlZCgpLnRoZW4ocmVzb2x2ZSwgcmVqZWN0KTsKKyAgICAg ICAgICAgICAgICAvLyBUaGlzIGNhbid0IHVzZSBgYXdhaXRFdmVudGAgc2luY2UgdGhlIHByb21p c2UgcmVzb2x1dGlvbiBoYXBwZW5zIG9uIHRoZSBuZXh0IHRpY2suc3NzCisgICAgICAgICAgICAg ICAgV0kuY2FudmFzTWFuYWdlci5zaW5nbGVGaXJlRXZlbnRMaXN0ZW5lcihXSS5DYW52YXNNYW5h Z2VyLkV2ZW50LkNhbnZhc0FkZGVkLCAoZXZlbnQpID0+IHsKKyAgICAgICAgICAgICAgICAgICAg YXdhaXRQcm9ncmFtQWRkZWQoKS50aGVuKHJlc29sdmUsIHJlamVjdCk7CisgICAgICAgICAgICAg ICAgfSk7CiAKICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LnJlbG9hZFBhZ2UoKTsKICAg ICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGYxZWY2MzA2MDI4Li40OWQz OGExNDM4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTgt MTAtMDkgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJ bnNwZWN0b3I6IFJFR1JFU1NJT046IGZpeCBjYW52YXMgdGVzdCBmYWlsdXJlcyBhZnRlciByMjM2 OTUyIGFuZCByMjM2OTU0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTA0MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ2FudmFzTWFuYWdlci5qczoKKyAg ICAgICAgKFdJLkNhbnZhc01hbmFnZXIucHJvdG90eXBlLl9yZW1vdmVDYW52YXMpOgorICAgICAg ICBDbGVhciB0aGUgYHNoYWRlclByb2dyYW1Db2xsZWN0aW9uYCB3aGVuIGEgYFdJLkNhbnZhc2Ag aXMgcmVtb3ZlZCBzbyB0aGF0IGEgcmVtb3ZlIGV2ZW50IGlzCisgICAgICAgIGZpcmVkIGZvciBl YWNoIGBXSS5TaGFkZXJQcm9ncmFtYC4KKwogMjAxOC0xMC0wOCAgRGV2aW4gUm91c3NvICA8ZHJv dXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIGNvcm5lciByb3Vu ZGluZyB0byB0aGUgbmV0d29yayB0aW1pbmcgImJsb2NrcyIKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NhbnZhc01hbmFnZXIuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9DYW52YXNN YW5hZ2VyLmpzCmluZGV4IDBjMjJjNGI3NzgxLi44NmFhMGQ2NTg4MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ2FudmFzTWFuYWdl ci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVy cy9DYW52YXNNYW5hZ2VyLmpzCkBAIC0xOTksNiArMTk5LDggQEAgV0kuQ2FudmFzTWFuYWdlciA9 IGNsYXNzIENhbnZhc01hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgZm9yIChsZXQg cHJvZ3JhbSBvZiBjYW52YXMuc2hhZGVyUHJvZ3JhbUNvbGxlY3Rpb24pCiAgICAgICAgICAgICB0 aGlzLl9zaGFkZXJQcm9ncmFtSWRlbnRpZmllck1hcC5kZWxldGUocHJvZ3JhbS5pZGVudGlmaWVy KTsKIAorICAgICAgICBjYW52YXMuc2hhZGVyUHJvZ3JhbUNvbGxlY3Rpb24uY2xlYXIoKTsKKwog ICAgICAgICBmb3IgKGxldCByZWNvcmRpbmcgb2YgY2FudmFzLnJlY29yZGluZ0NvbGxlY3Rpb24p IHsKICAgICAgICAgICAgIHJlY29yZGluZy5zb3VyY2UgPSBudWxsOwogICAgICAgICAgICAgcmVj b3JkaW5nLmNyZWF0ZURpc3BsYXlOYW1lKHJlY29yZGluZy5kaXNwbGF5TmFtZSk7Cg== 351893 2018-10-09 10:44:01 -0700 2018-10-09 12:04:25 -0700 Patch 190403.diff text/plain 6033 hi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1YzAwM2E4ZDUwZC4uNjAzMDRhMzcyYTUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAor MjAxOC0xMC0wOSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAg V2ViIEluc3BlY3RvcjogUkVHUkVTU0lPTjogZml4IGNhbnZhcyB0ZXN0IGZhaWx1cmVzIGFmdGVy IHIyMzY5NTIgYW5kIHIyMzY5NTQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5MDQwMworCisgICAgICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQZWNvcmFy by4KKworICAgICAgICAqIGluc3BlY3Rvci9jYW52YXMvY3JlYXRlLWNvbnRleHQtd2VibWV0YWwu aHRtbDoKKyAgICAgICAgRml4IG1pc3NpbmcgcGFyZW50aGVzaXMuCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvY2FudmFzL3Jlc291cmNlcy9zaGFkZXJQcm9ncmFtLXV0aWxpdGllcy5qczoKKyAgICAg ICAgKGNyZWF0ZVByb2dyYW0pOgorICAgICAgICAoVGVzdFBhZ2UucmVnaXN0ZXJJbml0aWFsaXpl ci5hd2FpdFByb2dyYW1BZGRlZCk6CisgICAgICAgIChUZXN0UGFnZS5yZWdpc3RlckluaXRpYWxp emVyKToKKyAgICAgICAgKFRlc3RQYWdlLnJlZ2lzdGVySW5pdGlhbGl6ZXIud2luZG93LmluaXRp YWxpemVUZXN0U3VpdGUpOgorICAgICAgICBSZXBsYWNlIHRoZSBgV0kuQ2FudmFzTWFuYWdlcmAg ZXZlbnRzICh3aGljaCB3ZXJlIHJlbW92ZWQpIHdpdGggbGlzdGVuZXJzIGZvciBldmVudHMgb24g dGhlCisgICAgICAgIHNwZWNpZmljIGBXSS5DYW52YXNgLgorCiAyMDE4LTEwLTA4ICBEZXZpbiBS b3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBzaG93 IHJlZGlyZWN0IHJlcXVlc3RzIGluIE5ldHdvcmsgYW5kIFRpbWVsaW5lcyB0YWJzCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY2FudmFzL2NyZWF0ZS1jb250ZXh0LXdlYm1ldGFs Lmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY2FudmFzL2NyZWF0ZS1jb250ZXh0LXdlYm1l dGFsLmh0bWwKaW5kZXggOGU2ZTVmY2QxZDYuLmZiNDExNDMwNWZiIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvY2FudmFzL2NyZWF0ZS1jb250ZXh0LXdlYm1ldGFsLmh0bWwKKysr IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2NhbnZhcy9jcmVhdGUtY29udGV4dC13ZWJtZXRhbC5o dG1sCkBAIC0yMyw3ICsyMyw3IEBAIGZ1bmN0aW9uIHRlc3QoKSB7CiAgICAgICAgIGNvbnRleHRU eXBlOiBXSS5DYW52YXMuQ29udGV4dFR5cGUuV2ViTWV0YWwsCiAgICAgfSk7CiAKLSAgICBhZGRD U1NDYW52YXNUZXN0Q2FzZShXSS5DYW52YXMuQ29udGV4dFR5cGUuV2ViTWV0YWw7CisgICAgYWRk Q1NTQ2FudmFzVGVzdENhc2UoV0kuQ2FudmFzLkNvbnRleHRUeXBlLldlYk1ldGFsKTsKIAogICAg IHN1aXRlLnJ1blRlc3RDYXNlc0FuZEZpbmlzaCgpOwogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW5zcGVjdG9yL2NhbnZhcy9yZXNvdXJjZXMvc2hhZGVyUHJvZ3JhbS11dGlsaXRpZXMuanMg Yi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvY2FudmFzL3Jlc291cmNlcy9zaGFkZXJQcm9ncmFtLXV0 aWxpdGllcy5qcwppbmRleCBhMTE1MjFlNWU0OS4uOTNlYmIzNzgyMmEgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2luc3BlY3Rvci9jYW52YXMvcmVzb3VyY2VzL3NoYWRlclByb2dyYW0tdXRpbGl0 aWVzLmpzCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9jYW52YXMvcmVzb3VyY2VzL3NoYWRl clByb2dyYW0tdXRpbGl0aWVzLmpzCkBAIC0yLDcgKzIsOSBAQCBsZXQgY29udGV4dDsKIGxldCBw cm9ncmFtOwogCiBmdW5jdGlvbiBjcmVhdGVQcm9ncmFtKGNvbnRleHRUeXBlKSB7Ci0gICAgY29u dGV4dCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImNhbnZhcyIpLmdldENvbnRleHQoY29udGV4 dFR5cGUpOworICAgIGlmICghY29udGV4dCkKKyAgICAgICAgY29udGV4dCA9IGRvY3VtZW50LmNy ZWF0ZUVsZW1lbnQoImNhbnZhcyIpLmdldENvbnRleHQoY29udGV4dFR5cGUpOworCiAgICAgcHJv Z3JhbSA9IGNvbnRleHQuY3JlYXRlUHJvZ3JhbSgpOwogfQogCkBAIC00NSw5ICs0NywxMCBAQCBU ZXN0UGFnZS5yZWdpc3RlckluaXRpYWxpemVyKCgpID0+IHsKICAgICBsZXQgc3VpdGUgPSBudWxs OwogCiAgICAgZnVuY3Rpb24gYXdhaXRQcm9ncmFtQWRkZWQoKSB7Ci0gICAgICAgIHJldHVybiBX SS5jYW52YXNNYW5hZ2VyLmF3YWl0RXZlbnQoV0kuQ2FudmFzTWFuYWdlci5FdmVudC5TaGFkZXJQ cm9ncmFtQWRkZWQpCisgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KFdJLmNhbnZhc01hbmFn ZXIuY2FudmFzZXMubGVuZ3RoID09PSAxLCAiVGhlcmUgc2hvdWxkIG9ubHkgYmUgb25lIGNhbnZh cy4iKTsKKyAgICAgICAgcmV0dXJuIFdJLmNhbnZhc01hbmFnZXIuY2FudmFzZXNbMF0uc2hhZGVy UHJvZ3JhbUNvbGxlY3Rpb24uYXdhaXRFdmVudChXSS5Db2xsZWN0aW9uLkV2ZW50Lkl0ZW1BZGRl ZCkKICAgICAgICAgLnRoZW4oKGV2ZW50KSA9PiB7Ci0gICAgICAgICAgICBsZXQgcHJvZ3JhbSA9 IGV2ZW50LmRhdGEucHJvZ3JhbTsKKyAgICAgICAgICAgIGxldCBwcm9ncmFtID0gZXZlbnQuZGF0 YS5pdGVtOwogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RUaGF0KHByb2dyYW0gaW5z dGFuY2VvZiBXSS5TaGFkZXJQcm9ncmFtLCAiQWRkZWQgU2hhZGVyUHJvZ3JhbS4iKTsKICAgICAg ICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0VGhhdChwcm9ncmFtLmNhbnZhcyBpbnN0YW5jZW9m IFdJLkNhbnZhcywgIlNoYWRlclByb2dyYW0gc2hvdWxkIGhhdmUgYSBwYXJlbnQgQ2FudmFzLiIp OwogICAgICAgICAgICAgcmV0dXJuIHByb2dyYW07CkBAIC01NSw5ICs1OCwxMCBAQCBUZXN0UGFn ZS5yZWdpc3RlckluaXRpYWxpemVyKCgpID0+IHsKICAgICB9CiAKICAgICBmdW5jdGlvbiBhd2Fp dFByb2dyYW1SZW1vdmVkKCkgewotICAgICAgICByZXR1cm4gV0kuY2FudmFzTWFuYWdlci5hd2Fp dEV2ZW50KFdJLkNhbnZhc01hbmFnZXIuRXZlbnQuU2hhZGVyUHJvZ3JhbVJlbW92ZWQpCisgICAg ICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KFdJLmNhbnZhc01hbmFnZXIuY2FudmFzZXMubGVuZ3Ro ID09PSAxLCAiVGhlcmUgc2hvdWxkIG9ubHkgYmUgb25lIGNhbnZhcy4iKTsKKyAgICAgICAgcmV0 dXJuIFdJLmNhbnZhc01hbmFnZXIuY2FudmFzZXNbMF0uc2hhZGVyUHJvZ3JhbUNvbGxlY3Rpb24u YXdhaXRFdmVudChXSS5Db2xsZWN0aW9uLkV2ZW50Lkl0ZW1SZW1vdmVkKQogICAgICAgICAudGhl bigoZXZlbnQpID0+IHsKLSAgICAgICAgICAgIGxldCBwcm9ncmFtID0gZXZlbnQuZGF0YS5wcm9n cmFtOworICAgICAgICAgICAgbGV0IHByb2dyYW0gPSBldmVudC5kYXRhLml0ZW07CiAgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQocHJvZ3JhbSBpbnN0YW5jZW9mIFdJLlNoYWRl clByb2dyYW0sICJSZW1vdmVkIFNoYWRlclByb2dyYW0uIik7CiAgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmV4cGVjdFRoYXQocHJvZ3JhbS5jYW52YXMgaW5zdGFuY2VvZiBXSS5DYW52YXMsICJT aGFkZXJQcm9ncmFtIHNob3VsZCBoYXZlIGEgcGFyZW50IENhbnZhcy4iKTsKICAgICAgICAgICAg IHJldHVybiBwcm9ncmFtOwpAQCAtNzEsNyArNzUsMTAgQEAgVGVzdFBhZ2UucmVnaXN0ZXJJbml0 aWFsaXplcigoKSA9PiB7CiAgICAgICAgICAgICBuYW1lOiBgJHtzdWl0ZS5uYW1lfS5yZWxvYWRQ YWdlYCwKICAgICAgICAgICAgIGRlc2NyaXB0aW9uOiAiQ2hlY2sgdGhhdCBTaGFkZXJQcm9ncmFt QWRkZWQgaXMgc2VudCBmb3IgYSBwcm9ncmFtIGNyZWF0ZWQgYmVmb3JlIENhbnZhc0FnZW50IGlz IGVuYWJsZWQuIiwKICAgICAgICAgICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7Ci0gICAgICAg ICAgICAgICAgYXdhaXRQcm9ncmFtQWRkZWQoKS50aGVuKHJlc29sdmUsIHJlamVjdCk7CisgICAg ICAgICAgICAgICAgLy8gVGhpcyBjYW4ndCB1c2UgYGF3YWl0RXZlbnRgIHNpbmNlIHRoZSBwcm9t aXNlIHJlc29sdXRpb24gaGFwcGVucyBvbiB0aGUgbmV4dCB0aWNrLgorICAgICAgICAgICAgICAg IFdJLmNhbnZhc01hbmFnZXIuc2luZ2xlRmlyZUV2ZW50TGlzdGVuZXIoV0kuQ2FudmFzTWFuYWdl ci5FdmVudC5DYW52YXNBZGRlZCwgKGV2ZW50KSA9PiB7CisgICAgICAgICAgICAgICAgICAgIGF3 YWl0UHJvZ3JhbUFkZGVkKCkudGhlbihyZXNvbHZlLCByZWplY3QpOworICAgICAgICAgICAgICAg IH0pOwogCiAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5yZWxvYWRQYWdlKCk7CiAgICAg ICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIv U291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBmMWVmNjMwNjAyOC4uNDlkMzhh MTQzODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE4LTEw LTA5ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBSRUdSRVNTSU9OOiBmaXggY2FudmFzIHRlc3QgZmFpbHVyZXMgYWZ0ZXIgcjIzNjk1 MiBhbmQgcjIzNjk1NAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTkwNDAzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9DYW52YXNNYW5hZ2VyLmpzOgorICAg ICAgICAoV0kuQ2FudmFzTWFuYWdlci5wcm90b3R5cGUuX3JlbW92ZUNhbnZhcyk6CisgICAgICAg IENsZWFyIHRoZSBgc2hhZGVyUHJvZ3JhbUNvbGxlY3Rpb25gIHdoZW4gYSBgV0kuQ2FudmFzYCBp cyByZW1vdmVkIHNvIHRoYXQgYSByZW1vdmUgZXZlbnQgaXMKKyAgICAgICAgZmlyZWQgZm9yIGVh Y2ggYFdJLlNoYWRlclByb2dyYW1gLgorCiAyMDE4LTEwLTA4ICBEZXZpbiBSb3Vzc28gIDxkcm91 c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBhZGQgY29ybmVyIHJvdW5k aW5nIHRvIHRoZSBuZXR3b3JrIHRpbWluZyAiYmxvY2tzIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ2FudmFzTWFuYWdlci5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NhbnZhc01h bmFnZXIuanMKaW5kZXggMGMyMmM0Yjc3ODEuLjg2YWEwZDY1ODgwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9DYW52YXNNYW5hZ2Vy LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJz L0NhbnZhc01hbmFnZXIuanMKQEAgLTE5OSw2ICsxOTksOCBAQCBXSS5DYW52YXNNYW5hZ2VyID0g Y2xhc3MgQ2FudmFzTWFuYWdlciBleHRlbmRzIFdJLk9iamVjdAogICAgICAgICBmb3IgKGxldCBw cm9ncmFtIG9mIGNhbnZhcy5zaGFkZXJQcm9ncmFtQ29sbGVjdGlvbikKICAgICAgICAgICAgIHRo aXMuX3NoYWRlclByb2dyYW1JZGVudGlmaWVyTWFwLmRlbGV0ZShwcm9ncmFtLmlkZW50aWZpZXIp OwogCisgICAgICAgIGNhbnZhcy5zaGFkZXJQcm9ncmFtQ29sbGVjdGlvbi5jbGVhcigpOworCiAg ICAgICAgIGZvciAobGV0IHJlY29yZGluZyBvZiBjYW52YXMucmVjb3JkaW5nQ29sbGVjdGlvbikg ewogICAgICAgICAgICAgcmVjb3JkaW5nLnNvdXJjZSA9IG51bGw7CiAgICAgICAgICAgICByZWNv cmRpbmcuY3JlYXRlRGlzcGxheU5hbWUocmVjb3JkaW5nLmRpc3BsYXlOYW1lKTsK