196663 2019-04-05 16:15:46 -0700 Web Inspector: REGRESSION: Audit: default audits aren't added when an existing audit is present 2019-04-08 13:46:41 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi commit-queue hi inspector-bugzilla-changes timothy webkit-bug-importer oldest_to_newest 1524884 0 hi 2019-04-05 16:15:46 -0700 # STEPS TO REPRODUCE: 1. inspect any page 2. go to the Audits tab => if any audits exist, delete them all and go back to 1 3. add an audit to the Audits tab 4. close Web Inspector 5. open Web Inspector => the only audit shown is the one that was added by 3 => the "Demo Audit" and "Accessibility" audits are both missing (not in Edit menu either) 1524887 1 webkit-bug-importer 2019-04-05 16:18:51 -0700 <rdar://problem/49660757> 1525272 2 366957 hi 2019-04-08 11:42:46 -0700 Created attachment 366957 Patch 1525337 3 366957 commit-queue 2019-04-08 13:46:39 -0700 Comment on attachment 366957 Patch Clearing flags on attachment: 366957 Committed r244039: <https://trac.webkit.org/changeset/244039> 1525338 4 commit-queue 2019-04-08 13:46:41 -0700 All reviewed patches have been landed. Closing bug. 366957 2019-04-08 11:42:46 -0700 2019-04-08 13:46:39 -0700 Patch bug-196663-20190408114245.patch text/plain 11842 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDY4MDlmOGRhYjI4ZGRiOGY5Nzc3ZTAyODNlMzdl MTMwNThlMDAzNDIuLmI2MmJjN2E3ZjcwY2UwODM4ZGU0OGI1ZDFlNTk4NDRhMjlhNGNmNGEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE5LTA0LTA4ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBS RUdSRVNTSU9OOiBBdWRpdDogZGVmYXVsdCBhdWRpdHMgYXJlbid0IGFkZGVkIHdoZW4gYW4gZXhp c3RpbmcgYXVkaXQgaXMgcHJlc2VudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTk2NjYzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80OTY2MDc1Nz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSYXRoZXIg dGhhbiBoYXZlIGEgYnV0dG9uIHRoYXQgYWxsb3dzIHRoZSB1c2VyIHRvIHJlLWFkZCB0aGUgZGVm YXVsdCBhdWRpdHMsIHByZXZlbnQgdGhlbQorICAgICAgICBmcm9tIGJlaW5nIGRlbGV0YWJsZSBp biB0aGUgZmlyc3QgcGxhY2UuICJEZWxldGluZyIgYSBkZWZhdWx0IGF1ZGl0IHdpbGwgaW5zdGVh ZCBtYXJrIGl0IGFzCisgICAgICAgIGRpc2FibGVkIChhbmQgYmVlcCBpZiBpdCBpcyBhbHJlYWR5 IGRpc2FibGVkKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQXVkaXRN YW5hZ2VyLmpzOgorICAgICAgICAoV0kuQXVkaXRNYW5hZ2VyLnByb3RvdHlwZS5sb2FkU3RvcmVk VGVzdHMpOgorICAgICAgICAoV0kuQXVkaXRNYW5hZ2VyLnByb3RvdHlwZS5yZW1vdmVUZXN0KToK KyAgICAgICAgKFdJLkF1ZGl0TWFuYWdlci5wcm90b3R5cGUuX2FkZERlZmF1bHRUZXN0cyk6IEFk ZGVkLgorICAgICAgICAoV0kuQXVkaXRNYW5hZ2VyLnByb3RvdHlwZS5hZGREZWZhdWx0VGVzdHNJ Zk5lZWRlZCk6IERlbGV0ZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0 TmF2aWdhdGlvblNpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdJLkF1ZGl0TmF2aWdhdGlvblNp ZGViYXJQYW5lbC5wcm90b3R5cGUuX2FkZFRlc3QpOgorICAgICAgICAoV0kuQXVkaXROYXZpZ2F0 aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fdXBkYXRlU3RhcnRTdG9wQnV0dG9uTmF2aWdhdGlv bkl0ZW1TdGF0ZSk6CisgICAgICAgIChXSS5BdWRpdE5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJv dG90eXBlLl91cGRhdGVOb0F1ZGl0c1BsYWNlaG9sZGVyKToKKyAgICAgICAgKFdJLkF1ZGl0TmF2 aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUuX2hhbmRsZUF1ZGl0VGVzdFJlbW92ZWQpOgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQXVkaXROYXZpZ2F0aW9uU2lkZWJhclBhbmVs LmNzczoKKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLm5hdmlnYXRpb24uYXVkaXQuaGFzLXJl c3VsdHMgPiAuY29udGVudCA+IC5tZXNzYWdlLXRleHQtdmlldy5uby1lbmFibGVkLWF1ZGl0cyk6 IEFkZGVkLgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5hdWRpdC5oYXMt cmVzdWx0czpub3QoLmhhcy10ZXN0cykgPiAuY29udGVudCA+IC5tZXNzYWdlLXRleHQtdmlldyk6 IERlbGV0ZWQuCisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmF1ZGl0Lmhh cy1yZXN1bHRzOm5vdCguaGFzLXRlc3RzKSA+IC5jb250ZW50ID4gLm1lc3NhZ2UtdGV4dC12aWV3 ID4gLm1lc3NhZ2UpOiBEZWxldGVkLgorICAgICAgICAoLnNpZGViYXIgPiAucGFuZWwubmF2aWdh dGlvbi5hdWRpdC5oYXMtcmVzdWx0czpub3QoLmhhcy10ZXN0cykgPiAuY29udGVudCA+IC5tZXNz YWdlLXRleHQtdmlldyA+IGJ1dHRvbik6IERlbGV0ZWQuCisKKyAgICAgICAgKiBMb2NhbGl6YXRp b25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisKIDIwMTktMDQtMDMgIERldmluIFJv dXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNpbmds ZSBjbGljayBvbiBsaW5rcyBpbiBub24tcmVhZC1vbmx5IFRleHRFZGl0b3JzIHNob3VsZCBub3Qg Zm9sbG93IGxpbmtzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0 aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCBlZGZkY2U3 MTRkYzhlYWFhZjM2N2NjYWRhZWQ3MTAwOGIxYTM5NGRlLi5iNmY5YmZkMjMyYTA5YTNkYmUxZTBk ZDhkNmM2ZDQ2MTViNDBlMjZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9j YWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAg LTg0LDcgKzg0LDYgQEAgbG9jYWxpemVkU3RyaW5nc1siQWN0aXZpdHkgVmlld2VyIl0gPSAiQWN0 aXZpdHkgVmlld2VyIjsKIGxvY2FsaXplZFN0cmluZ3NbIkFkZCJdID0gIkFkZCI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJBZGQgQWN0aW9uIl0gPSAiQWRkIEFjdGlvbiI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJBZGQgQnJlYWtwb2ludCJdID0gIkFkZCBCcmVha3BvaW50IjsKLWxvY2FsaXplZFN0cmluZ3Nb IkFkZCBEZWZhdWx0IEF1ZGl0cyJdID0gIkFkZCBEZWZhdWx0IEF1ZGl0cyI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJBZGQgTmV3Il0gPSAiQWRkIE5ldyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBZGQgTmV3 IENsYXNzIl0gPSAiQWRkIE5ldyBDbGFzcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJBZGQgTmV3IFBy b2JlIEV4cHJlc3Npb24iXSA9ICJBZGQgTmV3IFByb2JlIEV4cHJlc3Npb24iOwpAQCAtNjcyLDcg KzY3MSw2IEBAIGxvY2FsaXplZFN0cmluZ3NbIk5vIEFjY2Vzc2liaWxpdHkgSW5mb3JtYXRpb24i XSA9ICJObyBBY2Nlc3NpYmlsaXR5IEluZm9ybWF0aW9uCiBsb2NhbGl6ZWRTdHJpbmdzWyJObyBB cHBsaWNhdGlvbiBDYWNoZSBpbmZvcm1hdGlvbiBhdmFpbGFibGUiXSA9ICJObyBBcHBsaWNhdGlv biBDYWNoZSBpbmZvcm1hdGlvbiBhdmFpbGFibGUiOwogbG9jYWxpemVkU3RyaW5nc1siTm8gQXNz b2NpYXRlZCBEYXRhIl0gPSAiTm8gQXNzb2NpYXRlZCBEYXRhIjsKIGxvY2FsaXplZFN0cmluZ3Nb Ik5vIEF0dHJpYnV0ZXMiXSA9ICJObyBBdHRyaWJ1dGVzIjsKLWxvY2FsaXplZFN0cmluZ3NbIk5v IEF1ZGl0cyJdID0gIk5vIEF1ZGl0cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJObyBCb3ggTW9kZWwg SW5mb3JtYXRpb24iXSA9ICJObyBCb3ggTW9kZWwgSW5mb3JtYXRpb24iOwogbG9jYWxpemVkU3Ry aW5nc1siTm8gQ1NTIENoYW5nZXMiXSA9ICJObyBDU1MgQ2hhbmdlcyI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJObyBDYW52YXMgQ29udGV4dHMiXSA9ICJObyBDYW52YXMgQ29udGV4dHMiOwpAQCAtNjgw LDYgKzY3OCw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIk5vIENhbnZhcyBTZWxlY3RlZCJdID0gIk5v IENhbnZhcyBTZWxlY3RlZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJObyBDaGFydCBBdmFpbGFibGUi XSA9ICJObyBDaGFydCBBdmFpbGFibGUiOwogbG9jYWxpemVkU3RyaW5nc1siTm8gQ2hpbGQgTGF5 ZXJzIl0gPSAiTm8gQ2hpbGQgTGF5ZXJzIjsKIGxvY2FsaXplZFN0cmluZ3NbIk5vIERhdGEgQmlu ZGluZ3MiXSA9ICJObyBEYXRhIEJpbmRpbmdzIjsKK2xvY2FsaXplZFN0cmluZ3NbIk5vIEVuYWJs ZWQgQXVkaXRzIl0gPSAiTm8gRW5hYmxlZCBBdWRpdHMiOwogbG9jYWxpemVkU3RyaW5nc1siTm8g RW50cmllcyJdID0gIk5vIEVudHJpZXMiOwogbG9jYWxpemVkU3RyaW5nc1siTm8gRXZlbnQgTGlz dGVuZXJzIl0gPSAiTm8gRXZlbnQgTGlzdGVuZXJzIjsKIGxvY2FsaXplZFN0cmluZ3NbIk5vIEZp bHRlciBSZXN1bHRzIl0gPSAiTm8gRmlsdGVyIFJlc3VsdHMiOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQXVkaXRNYW5hZ2VyLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQXVkaXRN YW5hZ2VyLmpzCmluZGV4IGMyMDgxMjJjNDJmZDkyNjZjZWNiNWZlYzRjODM5ZWU0NjdiYjJkYmUu LmI1ZDIyM2ZhY2U1NDI5YzI2NTAwYmIzMGQzYTJkZjI1OGE2ZWY2ZjYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0F1ZGl0TWFuYWdl ci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVy cy9BdWRpdE1hbmFnZXIuanMKQEAgLTI0NCw2ICsyNDQsOCBAQCBXSS5BdWRpdE1hbmFnZXIgPSBj bGFzcyBBdWRpdE1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgaWYgKHRoaXMuX3Rl c3RzLmxlbmd0aCkKICAgICAgICAgICAgIHJldHVybjsKIAorICAgICAgICB0aGlzLl9hZGREZWZh dWx0VGVzdHMoKTsKKwogICAgICAgICBXSS5vYmplY3RTdG9yZXMuYXVkaXRzLmdldEFsbCgpLnRo ZW4oYXN5bmMgKHRlc3RzKSA9PiB7CiAgICAgICAgICAgICBmb3IgKGxldCBwYXlsb2FkIG9mIHRl c3RzKSB7CiAgICAgICAgICAgICAgICAgbGV0IHRlc3QgPSBhd2FpdCBXSS5BdWRpdFRlc3RHcm91 cC5mcm9tUGF5bG9hZChwYXlsb2FkKSB8fCBhd2FpdCBXSS5BdWRpdFRlc3RDYXNlLmZyb21QYXls b2FkKHBheWxvYWQpOwpAQCAtMjU1LDE5ICsyNTcsMzEgQEAgV0kuQXVkaXRNYW5hZ2VyID0gY2xh c3MgQXVkaXRNYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICAgICAgICAgICAgICB0aGlz Ll9hZGRUZXN0KHRlc3QpOwogICAgICAgICAgICAgfQotCi0gICAgICAgICAgICB0aGlzLmFkZERl ZmF1bHRUZXN0c0lmTmVlZGVkKCk7CiAgICAgICAgIH0pOwogICAgIH0KIAogICAgIHJlbW92ZVRl c3QodGVzdCkKICAgICB7CisgICAgICAgIGlmICh0ZXN0Ll9fZGVmYXVsdCkgeworICAgICAgICAg ICAgaWYgKHRlc3QuZGlzYWJsZWQpIHsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JGcm9udGVu ZEhvc3QuYmVlcCgpOworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKwor ICAgICAgICAgICAgdGVzdC5kaXNhYmxlZCA9IHRydWU7CisKKyAgICAgICAgICAgIGxldCBkaXNh YmxlZFRlc3RzID0gdGhpcy5fZGlzYWJsZWREZWZhdWx0VGVzdHNTZXR0aW5nLnZhbHVlLnNsaWNl KCk7CisgICAgICAgICAgICBkaXNhYmxlZFRlc3RzLnB1c2godGVzdC5uYW1lKTsKKyAgICAgICAg ICAgIHRoaXMuX2Rpc2FibGVkRGVmYXVsdFRlc3RzU2V0dGluZy52YWx1ZSA9IGRpc2FibGVkVGVz dHM7CisKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCiAgICAgICAgIHRoaXMuX3Rl c3RzLnJlbW92ZSh0ZXN0KTsKIAogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVy cyhXSS5BdWRpdE1hbmFnZXIuRXZlbnQuVGVzdFJlbW92ZWQsIHt0ZXN0fSk7CiAKLSAgICAgICAg aWYgKCF0ZXN0Ll9fZGVmYXVsdCkKLSAgICAgICAgICAgIFdJLm9iamVjdFN0b3Jlcy5hdWRpdHMu ZGVsZXRlT2JqZWN0KHRlc3QpOworICAgICAgICBXSS5vYmplY3RTdG9yZXMuYXVkaXRzLmRlbGV0 ZU9iamVjdCh0ZXN0KTsKICAgICB9CiAKICAgICAvLyBQcml2YXRlCkBAIC0zMjcsMTEgKzM0MSw4 IEBAIFdJLkF1ZGl0TWFuYWdlciA9IGNsYXNzIEF1ZGl0TWFuYWdlciBleHRlbmRzIFdJLk9iamVj dAogICAgICAgICB9CiAgICAgfQogCi0gICAgYWRkRGVmYXVsdFRlc3RzSWZOZWVkZWQoKQorICAg IF9hZGREZWZhdWx0VGVzdHMoKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX3Rlc3RzLmxlbmd0 aCkKLSAgICAgICAgICAgIHJldHVybjsKLQogICAgICAgICBjb25zdCB0ZXN0TWVudVJvbGVGb3JS ZXF1aXJlZENoaWRyZW4gPSBmdW5jdGlvbigpIHsKICAgICAgICAgICAgIGNvbnN0IHJlbGF0aW9u c2hpcHMgPSB7CiAgICAgICAgICAgICAgICAgbWVudTogWyJtZW51aXRlbSIsICJtZW51aXRlbWNo ZWNrYm94IiwgIm1lbnVpdGVtcmFkaW8iXSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0TmF2aWdhdGlvblNpZGViYXJQYW5lbC5jc3Mg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BdWRpdE5hdmlnYXRp b25TaWRlYmFyUGFuZWwuY3NzCmluZGV4IGRkOGI3MTYxNGM3MmFjYzA1YjBhNjc1NDg4MjQyMTEw ZTM1N2IwZTIuLjU2YmZkNzYwMzViZThlMWYwMWMxYjFmNzk0MjBkM2FkN2JjMWU4ZDggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0TmF2 aWdhdGlvblNpZGViYXJQYW5lbC5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQXVkaXROYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmNzcwpAQCAtNTMsMTkg KzUzLDExIEBACiAgICAgYm90dG9tOiB2YXIoLS1uYXZpZ2F0aW9uLWJhci1oZWlnaHQpOwogfQog Ci0uc2lkZWJhciA+IC5wYW5lbC5uYXZpZ2F0aW9uLmF1ZGl0Lmhhcy1yZXN1bHRzOm5vdCguaGFz LXRlc3RzKSA+IC5jb250ZW50ID4gLm1lc3NhZ2UtdGV4dC12aWV3IHsKKy5zaWRlYmFyID4gLnBh bmVsLm5hdmlnYXRpb24uYXVkaXQuaGFzLXJlc3VsdHMgPiAuY29udGVudCA+IC5tZXNzYWdlLXRl eHQtdmlldy5uby1lbmFibGVkLWF1ZGl0cyB7CiAgICAgcG9zaXRpb246IGluaXRpYWw7CiAgICAg Ym9yZGVyLWJvdHRvbTogMXB4IHNvbGlkIHZhcigtLWJvcmRlci1jb2xvcik7CiB9CiAKLS5zaWRl YmFyID4gLnBhbmVsLm5hdmlnYXRpb24uYXVkaXQuaGFzLXJlc3VsdHM6bm90KC5oYXMtdGVzdHMp ID4gLmNvbnRlbnQgPiAubWVzc2FnZS10ZXh0LXZpZXcgPiAubWVzc2FnZSB7Ci0gICAgZGlzcGxh eTogbm9uZTsKLX0KLQotLnNpZGViYXIgPiAucGFuZWwubmF2aWdhdGlvbi5hdWRpdC5oYXMtcmVz dWx0czpub3QoLmhhcy10ZXN0cykgPiAuY29udGVudCA+IC5tZXNzYWdlLXRleHQtdmlldyA+IGJ1 dHRvbiB7Ci0gICAgbWFyZ2luOiA4cHggMCA3cHg7Ci19Ci0KIC5maW5pc2gtZWRpdGluZy1hdWRp dHMtcGxhY2Vob2xkZXIubWVzc2FnZS10ZXh0LXZpZXcgLm5hdmlnYXRpb24taXRlbS1oZWxwIC5u YXZpZ2F0aW9uLWJhciB7CiAgICAgcGFkZGluZzogMDsKICAgICB2ZXJ0aWNhbC1hbGlnbjogMC41 cHg7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9BdWRpdE5hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9BdWRpdE5hdmlnYXRpb25TaWRlYmFyUGFuZWwuanMKaW5kZXgg NDk2YjUxOWYxZjI2Zjk0OTE4N2RhYzI5NTIxZWI0MWFkMTliODBmZi4uYjVjMTk2ZGFlMTYwZWVm ZWZlNDZhMDgwOWMwMWM0YTdkYjE5ZDNiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXVkaXROYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0TmF2aWdh dGlvblNpZGViYXJQYW5lbC5qcwpAQCAtMTU4LDggKzE1OCw2IEBAIFdJLkF1ZGl0TmF2aWdhdGlv blNpZGViYXJQYW5lbCA9IGNsYXNzIEF1ZGl0TmF2aWdhdGlvblNpZGViYXJQYW5lbCBleHRlbmRz IFdJLk5hCiAKICAgICBfYWRkVGVzdCh0ZXN0KQogICAgIHsKLSAgICAgICAgdGhpcy5lbGVtZW50 LmNsYXNzTGlzdC5hZGQoImhhcy10ZXN0cyIpOwotCiAgICAgICAgIGxldCB0cmVlRWxlbWVudCA9 IG5ldyBXSS5BdWRpdFRyZWVFbGVtZW50KHRlc3QpOwogCiAgICAgICAgIGlmICh0aGlzLl9yZXN1 bHRzRm9sZGVyVHJlZUVsZW1lbnQpIHsKQEAgLTE3MCw4ICsxNjgsNyBAQCBXSS5BdWRpdE5hdmln YXRpb25TaWRlYmFyUGFuZWwgPSBjbGFzcyBBdWRpdE5hdmlnYXRpb25TaWRlYmFyUGFuZWwgZXh0 ZW5kcyBXSS5OYQogCiAgICAgICAgIHRoaXMuX3VwZGF0ZVN0YXJ0U3RvcEJ1dHRvbk5hdmlnYXRp b25JdGVtU3RhdGUoKTsKICAgICAgICAgdGhpcy5fdXBkYXRlRWRpdEJ1dHRvbk5hdmlnYXRpb25J dGVtU3RhdGUoKTsKLQotICAgICAgICB0aGlzLmhpZGVFbXB0eUNvbnRlbnRQbGFjZWhvbGRlcigp OworICAgICAgICB0aGlzLl91cGRhdGVOb0F1ZGl0c1BsYWNlaG9sZGVyKCk7CiAgICAgfQogCiAg ICAgX2FkZFJlc3VsdChyZXN1bHQsIGluZGV4KQpAQCAtMjA0LDcgKzIwMSw3IEBAIFdJLkF1ZGl0 TmF2aWdhdGlvblNpZGViYXJQYW5lbCA9IGNsYXNzIEF1ZGl0TmF2aWdhdGlvblNpZGViYXJQYW5l bCBleHRlbmRzIFdJLk5hCiAgICAgX3VwZGF0ZVN0YXJ0U3RvcEJ1dHRvbk5hdmlnYXRpb25JdGVt U3RhdGUoKQogICAgIHsKICAgICAgICAgdGhpcy5fc3RhcnRTdG9wQnV0dG9uTmF2aWdhdGlvbkl0 ZW0udG9nZ2xlZCA9IFdJLmF1ZGl0TWFuYWdlci5ydW5uaW5nU3RhdGUgPT09IFdJLkF1ZGl0TWFu YWdlci5SdW5uaW5nU3RhdGUuQWN0aXZlIHx8IFdJLmF1ZGl0TWFuYWdlci5ydW5uaW5nU3RhdGUg PT09IFdJLkF1ZGl0TWFuYWdlci5SdW5uaW5nU3RhdGUuU3RvcHBpbmc7Ci0gICAgICAgIHRoaXMu X3N0YXJ0U3RvcEJ1dHRvbk5hdmlnYXRpb25JdGVtLmVuYWJsZWQgPSBXSS5hdWRpdE1hbmFnZXIu dGVzdHMubGVuZ3RoICYmIChXSS5hdWRpdE1hbmFnZXIucnVubmluZ1N0YXRlID09PSBXSS5BdWRp dE1hbmFnZXIuUnVubmluZ1N0YXRlLkluYWN0aXZlIHx8IFdJLmF1ZGl0TWFuYWdlci5ydW5uaW5n U3RhdGUgPT09IFdJLkF1ZGl0TWFuYWdlci5SdW5uaW5nU3RhdGUuQWN0aXZlKTsKKyAgICAgICAg dGhpcy5fc3RhcnRTdG9wQnV0dG9uTmF2aWdhdGlvbkl0ZW0uZW5hYmxlZCA9IFdJLmF1ZGl0TWFu YWdlci50ZXN0cy5zb21lKCh0ZXN0KSA9PiAhdGVzdC5kaXNhYmxlZCkgJiYgKFdJLmF1ZGl0TWFu YWdlci5ydW5uaW5nU3RhdGUgPT09IFdJLkF1ZGl0TWFuYWdlci5SdW5uaW5nU3RhdGUuSW5hY3Rp dmUgfHwgV0kuYXVkaXRNYW5hZ2VyLnJ1bm5pbmdTdGF0ZSA9PT0gV0kuQXVkaXRNYW5hZ2VyLlJ1 bm5pbmdTdGF0ZS5BY3RpdmUpOwogICAgIH0KIAogICAgICBfdXBkYXRlRWRpdEJ1dHRvbk5hdmln YXRpb25JdGVtU3RhdGUoKQpAQCAtMjE2LDI4ICsyMTMsMjAgQEAgV0kuQXVkaXROYXZpZ2F0aW9u U2lkZWJhclBhbmVsID0gY2xhc3MgQXVkaXROYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMg V0kuTmEKIAogICAgIF91cGRhdGVOb0F1ZGl0c1BsYWNlaG9sZGVyKCkKICAgICB7Ci0gICAgICAg IGlmIChXSS5hdWRpdE1hbmFnZXIuZWRpdGluZyB8fCBXSS5hdWRpdE1hbmFnZXIudGVzdHMuc29t ZSgodGVzdCkgPT4gIXRlc3QuZGlzYWJsZWQpKQorICAgICAgICBpZiAoV0kuYXVkaXRNYW5hZ2Vy LmVkaXRpbmcgfHwgV0kuYXVkaXRNYW5hZ2VyLnRlc3RzLnNvbWUoKHRlc3QpID0+ICF0ZXN0LmRp c2FibGVkKSkgeworICAgICAgICAgICAgaWYgKCF0aGlzLmhhc0FjdGl2ZUZpbHRlcnMpCisgICAg ICAgICAgICAgICAgdGhpcy5oaWRlRW1wdHlDb250ZW50UGxhY2Vob2xkZXIoKTsKICAgICAgICAg ICAgIHJldHVybjsKLQotICAgICAgICBsZXQgY29udGVudFBsYWNlaG9sZGVyID0gV0kuY3JlYXRl TWVzc2FnZVRleHRWaWV3KFdJLlVJU3RyaW5nKCJObyBBdWRpdHMiKSk7Ci0KLSAgICAgICAgbGV0 IGRlZmF1bHRCdXR0b25FbGVtZW50ID0gY29udGVudFBsYWNlaG9sZGVyLmFwcGVuZENoaWxkKGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImJ1dHRvbiIpKTsKLSAgICAgICAgZGVmYXVsdEJ1dHRvbkVs ZW1lbnQudGV4dENvbnRlbnQgPSBXSS5VSVN0cmluZygiQWRkIERlZmF1bHQgQXVkaXRzIik7Ci0g ICAgICAgIGRlZmF1bHRCdXR0b25FbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgKCkg PT4gewotICAgICAgICAgICAgV0kuYXVkaXRNYW5hZ2VyLmFkZERlZmF1bHRUZXN0c0lmTmVlZGVk KCk7Ci0gICAgICAgIH0pOwotCi0gICAgICAgIGNvbnRlbnRQbGFjZWhvbGRlciA9IHRoaXMuc2hv d0VtcHR5Q29udGVudFBsYWNlaG9sZGVyKGNvbnRlbnRQbGFjZWhvbGRlcik7Ci0KLSAgICAgICAg aWYgKFdJLmF1ZGl0TWFuYWdlci5yZXN1bHRzLmxlbmd0aCkgewotICAgICAgICAgICAgY29uc29s ZS5hc3NlcnQodGhpcy5jb250ZW50VHJlZU91dGxpbmUuY2hpbGRyZW5bMF0gPT09IHRoaXMuX3Jl c3VsdHNGb2xkZXJUcmVlRWxlbWVudCk7Ci0KLSAgICAgICAgICAgIC8vIE1vdmUgdGhlIHBsYWNl aG9sZGVyIHRvIGJlIHRoZSBmaXJzdCBlbGVtZW50IGluIHRoZSBjb250ZW50IGFyZWEsIHdoZXJl IGl0IHdpbGwKLSAgICAgICAgICAgIC8vIGJlIHN0eWxlZCBzdWNoIHRoYXQgb25seSB0aGUgYnV0 dG9uIGlzIHZpc2libGUuCi0gICAgICAgICAgICB0aGlzLmNvbnRlbnRWaWV3LmVsZW1lbnQuaW5z ZXJ0QmVmb3JlKGNvbnRlbnRQbGFjZWhvbGRlciwgdGhpcy5jb250ZW50Vmlldy5lbGVtZW50LmZp cnN0Q2hpbGQpOwogICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5fdXBkYXRlRWRpdEJ1dHRvbk5h dmlnYXRpb25JdGVtU3RhdGUoKTsKKyAgICAgICAgbGV0IGNvbnRlbnRQbGFjZWhvbGRlciA9IHRo aXMuc2hvd0VtcHR5Q29udGVudFBsYWNlaG9sZGVyKFdJLlVJU3RyaW5nKCJObyBFbmFibGVkIEF1 ZGl0cyIpKTsKKyAgICAgICAgY29udGVudFBsYWNlaG9sZGVyLmNsYXNzTGlzdC5hZGQoIm5vLWVu YWJsZWQtYXVkaXRzIik7CisKKyAgICAgICAgaWYgKFdJLmF1ZGl0TWFuYWdlci5yZXN1bHRzLmxl bmd0aCkgeworICAgICAgICAgICAgLy8gTW92ZSB0aGUgcGxhY2Vob2xkZXIgdG8gYmUgdGhlIGZp cnN0IGVsZW1lbnQgaW4gdGhlIGNvbnRlbnQgYXJlYSwgd2hlcmUgaXQgd2lsbAorICAgICAgICAg ICAgLy8gYmUgc3R5bGVkIHNvIHRoYXQgaXQgZG9lc24ndCBvYnN0cnVjdCB0aGUgcmVzdWx0cyBl bGVtZW50cy4KKyAgICAgICAgICAgIHRoaXMuY29udGVudFZpZXcuZWxlbWVudC5pbnNlcnRCZWZv cmUoY29udGVudFBsYWNlaG9sZGVyLCB0aGlzLmNvbnRlbnRWaWV3LmVsZW1lbnQuZmlyc3RDaGls ZCk7CisgICAgICAgIH0KICAgICB9CiAKICAgICBfaGFuZGxlQXVkaXRNYW5hZ2VyRWRpdGluZ0No YW5nZWQoZXZlbnQpCkBAIC0yNzksOSArMjY4LDggQEAgV0kuQXVkaXROYXZpZ2F0aW9uU2lkZWJh clBhbmVsID0gY2xhc3MgQXVkaXROYXZpZ2F0aW9uU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuTmEK ICAgICAgICAgbGV0IHRyZWVFbGVtZW50ID0gdGhpcy50cmVlRWxlbWVudEZvclJlcHJlc2VudGVk T2JqZWN0KHRlc3QpOwogICAgICAgICB0aGlzLmNvbnRlbnRUcmVlT3V0bGluZS5yZW1vdmVDaGls ZCh0cmVlRWxlbWVudCk7CiAKLSAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC50b2dnbGUo Imhhcy10ZXN0cyIsICEhV0kuYXVkaXRNYW5hZ2VyLnRlc3RzLmxlbmd0aCk7Ci0KICAgICAgICAg dGhpcy5fdXBkYXRlU3RhcnRTdG9wQnV0dG9uTmF2aWdhdGlvbkl0ZW1TdGF0ZSgpOworICAgICAg ICB0aGlzLl91cGRhdGVFZGl0QnV0dG9uTmF2aWdhdGlvbkl0ZW1TdGF0ZSgpOwogICAgICAgICB0 aGlzLl91cGRhdGVOb0F1ZGl0c1BsYWNlaG9sZGVyKCk7CiAgICAgfQogCg==