230014 2021-09-07 11:49:16 -0700 Simplify PrivateClickMeasurementManager interface 2021-09-15 12:49:59 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=230317 InRadar P2 Normal --- 1 achristensen achristensen webkit-bug-importer wilander oldest_to_newest 1791146 0 achristensen 2021-09-07 11:49:16 -0700 Simplify PrivateClickMeasurementManager interface 1791147 1 437539 achristensen 2021-09-07 11:50:51 -0700 Created attachment 437539 Patch 1791167 2 437542 achristensen 2021-09-07 12:50:15 -0700 Created attachment 437542 Patch 1791196 3 437542 wilander 2021-09-07 13:36:56 -0700 Comment on attachment 437542 Patch r=me 1791235 4 achristensen 2021-09-07 15:13:30 -0700 http://trac.webkit.org/r282109 1791238 5 webkit-bug-importer 2021-09-07 15:15:33 -0700 <rdar://problem/82841844> 437539 2021-09-07 11:50:51 -0700 2021-09-07 12:50:14 -0700 Patch bug-230014-20210907115050.patch text/plain 5419 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDMwYTkyZGEwNGRhNDQ5MTVj ODVmYjFlZjYxNTAxYjc4YjQzNjFlMTEuLjBhYWNjMzRjMDQwMmU5NzIzNmM3YzkwZmQ2Yjg4Mjg3 YjRlNjhkODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjEtMDktMDcgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBTaW1wbGlmeSBQ cml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIgaW50ZXJmYWNlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAwMTQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXNvdXJjZVJlcXVlc3Qgc2VyaWFsaXph dGlvbiBpcyBleGNlc3NpdmUgYW5kIGNvbXBsaWNhdGVkLgorICAgICAgICBMZXQncyBqdXN0IHNl cmlhbGl6ZSB0aGUgcGFydHMgd2UgbmVlZCBpbnN0ZWFkLgorICAgICAgICBBbHNvIGFkZCBhIG1p c3NpbmcgaW5jbHVkZS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9u LmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb246OmhhbmRsZVByaXZhdGVDbGlj a01lYXN1cmVtZW50Q29udmVyc2lvbik6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvUHJpdmF0 ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRDbGllbnQuaDoKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tN ZWFzdXJlbWVudE1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpQcml2YXRlQ2xpY2tNZWFz dXJlbWVudE1hbmFnZXI6OmhhbmRsZUF0dHJpYnV0aW9uKToKKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFn ZXIuaDoKKwogMjAyMS0wOS0wMyAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxl LmNvbT4KIAogICAgICAgICBTYWZhcmnigJlzIFByaXZhY3kgUmVwb3J0IHdpbmRvdyBpcyBjb21w bGV0ZWx5IGJsYW5rCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05l dHdvcmtTZXNzaW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nl c3Npb24uY3BwCmluZGV4IDUyZjZiYzk5N2U3ZDRkZDA0OGUzZDIzZjgxNzQ2ZGE3N2ZkM2VlYmQu LjU0M2NhYjEwMGJjN2JjOTlmNTQwZjM5NGJmZjcyM2ZiY2NkYWViM2EgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwCkBAIC0zMTYsNyArMzE2 LDcgQEAgdm9pZCBOZXR3b3JrU2Vzc2lvbjo6c3RvcmVQcml2YXRlQ2xpY2tNZWFzdXJlbWVudChX ZWJDb3JlOjpQcml2YXRlQ2xpY2tNZWFzdXJlbWUKIAogdm9pZCBOZXR3b3JrU2Vzc2lvbjo6aGFu ZGxlUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRDb252ZXJzaW9uKFByaXZhdGVDbGlja01lYXN1cmVt ZW50OjpBdHRyaWJ1dGlvblRyaWdnZXJEYXRhJiYgYXR0cmlidXRpb25UcmlnZ2VyRGF0YSwgY29u c3QgVVJMJiByZXF1ZXN0VVJMLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlZGly ZWN0UmVxdWVzdCkKIHsKLSAgICBwcml2YXRlQ2xpY2tNZWFzdXJlbWVudCgpLmhhbmRsZUF0dHJp YnV0aW9uKFdURk1vdmUoYXR0cmlidXRpb25UcmlnZ2VyRGF0YSksIHJlcXVlc3RVUkwsIHJlZGly ZWN0UmVxdWVzdCk7CisgICAgcHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQoKS5oYW5kbGVBdHRyaWJ1 dGlvbihXVEZNb3ZlKGF0dHJpYnV0aW9uVHJpZ2dlckRhdGEpLCByZXF1ZXN0VVJMLCBSZWdpc3Ry YWJsZURvbWFpbihyZWRpcmVjdFJlcXVlc3QudXJsKCkpLCByZWRpcmVjdFJlcXVlc3QuZmlyc3RQ YXJ0eUZvckNvb2tpZXMoKSk7CiB9CiAKIHZvaWQgTmV0d29ya1Nlc3Npb246OmR1bXBQcml2YXRl Q2xpY2tNZWFzdXJlbWVudChDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFN0cmluZyk+JiYgY29tcGxl dGlvbkhhbmRsZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1By aXZhdGVDbGlja01lYXN1cmVtZW50L1ByaXZhdGVDbGlja01lYXN1cmVtZW50Q2xpZW50LmggYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50L1ByaXZh dGVDbGlja01lYXN1cmVtZW50Q2xpZW50LmgKaW5kZXggOTIwOWQ5NzE3ZmFiYjhiNTUzY2Y5ZWQ3 NTlkZWU4MjQ5MjI2OWE5OS4uYzYzMTc0NmIyODAzN2E5ZDljY2NmZGI1ZjRiZGE0YjdkYmQyMzA4 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tN ZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudENsaWVudC5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnRDbGllbnQuaApAQCAtMjUsNiArMjUsNyBAQAogCiAjcHJhZ21hIG9uY2UKIAor I2luY2x1ZGUgPFdlYkNvcmUvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQuaD4KICNpbmNsdWRlIDx3 dGYvSlNPTlZhbHVlcy5oPgogCiBuYW1lc3BhY2UgSlNDIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnRNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJp dmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmNwcApp bmRleCA0ZWRmNjI1NzY2MjcyOTNiYmFjNWQ3ZDkxYmRjOWZlNzZlZDYyYzE1Li41YzBjODc0NTUz MzI5YTA4YTQ1OTgyMjI2OTNmYTI3YzI1ZjE1ODY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50L1ByaXZhdGVDbGlja01lYXN1 cmVtZW50TWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2 YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIuY3BwCkBA IC0yMzAsMTQgKzIzMCwxMSBAQCB2b2lkIFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6 bWlncmF0ZVByaXZhdGVDbGlja01lYXN1cmVtZW50RnJvbUxlZ2FjeVN0bwogICAgIHN0b3JlKCku aW5zZXJ0UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQoV1RGTW92ZShtZWFzdXJlbWVudCksIHR5cGUp OwogfQogCi12b2lkIFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6aGFuZGxlQXR0cmli dXRpb24oQXR0cmlidXRpb25UcmlnZ2VyRGF0YSYmIGF0dHJpYnV0aW9uVHJpZ2dlckRhdGEsIGNv bnN0IFVSTCYgcmVxdWVzdFVSTCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZWRp cmVjdFJlcXVlc3QpCit2b2lkIFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6aGFuZGxl QXR0cmlidXRpb24oQXR0cmlidXRpb25UcmlnZ2VyRGF0YSYmIGF0dHJpYnV0aW9uVHJpZ2dlckRh dGEsIGNvbnN0IFVSTCYgcmVxdWVzdFVSTCwgV2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4mJiBy ZWRpcmVjdERvbWFpbiwgY29uc3QgVVJMJiBmaXJzdFBhcnR5VVJMKQogewogICAgIGlmICghZmVh dHVyZUVuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgUmVnaXN0cmFibGVEb21haW4g cmVkaXJlY3REb21haW4geyByZWRpcmVjdFJlcXVlc3QudXJsKCkgfTsKLSAgICBhdXRvJiBmaXJz dFBhcnR5VVJMID0gcmVkaXJlY3RSZXF1ZXN0LmZpcnN0UGFydHlGb3JDb29raWVzKCk7Ci0KICAg ICBpZiAoIXJlZGlyZWN0RG9tYWluLm1hdGNoZXMocmVxdWVzdFVSTCkpIHsKICAgICAgICAgbV9j bGllbnQtPmJyb2FkY2FzdENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VMZXZlbDo6V2FybmluZywgIltQ cml2YXRlIENsaWNrIE1lYXN1cmVtZW50XSBUcmlnZ2VyaW5nIGV2ZW50IHdhcyBub3QgYWNjZXB0 ZWQgYmVjYXVzZSB0aGUgSFRUUCByZWRpcmVjdCB3YXMgbm90IHNhbWUtc2l0ZS4iX3MpOwogICAg ICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1By aXZhdGVDbGlja01lYXN1cmVtZW50L1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5oIGIv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2 YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIuaAppbmRleCAxMTBiN2UzZGIzODM4Yjc0NTI3NTZk ZmE0NzIyMzA1YWQwNDc5ZTc4Li5iYjgyMjJjMmM5ZGJiMDc3MmJkMzllNzlmNDQzMDVmNDcwYmU5 ZjU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlj a01lYXN1cmVtZW50L1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNs aWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmgKQEAgLTU4LDcgKzU4LDcgQEAgcHVibGljOgogICAgIH5Q cml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIoKTsKIAogICAgIHZvaWQgc3RvcmVVbmF0dHJp YnV0ZWQoUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQmJik7Ci0gICAgdm9pZCBoYW5kbGVBdHRyaWJ1 dGlvbihBdHRyaWJ1dGlvblRyaWdnZXJEYXRhJiYsIGNvbnN0IFVSTCYgcmVxdWVzdFVSTCwgY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZWRpcmVjdFJlcXVlc3QpOworICAgIHZvaWQg aGFuZGxlQXR0cmlidXRpb24oQXR0cmlidXRpb25UcmlnZ2VyRGF0YSYmLCBjb25zdCBVUkwmIHJl cXVlc3RVUkwsIFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluJiYgcmVkaXJlY3REb21haW4sIGNv bnN0IFVSTCYgZmlyc3RQYXJ0eVVSTCk7CiAgICAgdm9pZCBjbGVhcihDb21wbGV0aW9uSGFuZGxl cjx2b2lkKCk+JiYpOwogICAgIHZvaWQgY2xlYXJGb3JSZWdpc3RyYWJsZURvbWFpbihjb25zdCBS ZWdpc3RyYWJsZURvbWFpbiYsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CiAgICAgdm9p ZCBtaWdyYXRlUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRGcm9tTGVnYWN5U3RvcmFnZShQcml2YXRl Q2xpY2tNZWFzdXJlbWVudCYmLCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudEF0dHJpYnV0aW9uVHlw ZSk7Cg== 437542 2021-09-07 12:50:15 -0700 2021-09-07 13:36:56 -0700 Patch bug-230014-20210907125014.patch text/plain 4803 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMTA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDEzZGEzNThjZGM5YjZiZjYz OGFkODZiYzM2YzQ4MWM3YmU2ZmVjYjMuLmQxZWIxYjBmZGNlYjc2YmNmNGViYjg0MzdmYjdiNzIw MzZhN2E5NmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDktMDcgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBTaW1wbGlmeSBQ cml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIgaW50ZXJmYWNlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzAwMTQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXNvdXJjZVJlcXVlc3Qgc2VyaWFsaXph dGlvbiBpcyBleGNlc3NpdmUgYW5kIGNvbXBsaWNhdGVkLgorICAgICAgICBMZXQncyBqdXN0IHNl cmlhbGl6ZSB0aGUgcGFydHMgd2UgbmVlZCBpbnN0ZWFkLgorCisgICAgICAgICogTmV0d29ya1By b2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lv bjo6aGFuZGxlUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRDb252ZXJzaW9uKToKKyAgICAgICAgKiBO ZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tNZWFzdXJl bWVudENsaWVudC5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1 cmVtZW50L1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5jcHA6CisgICAgICAgIChXZWJL aXQ6OlByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6aGFuZGxlQXR0cmlidXRpb24pOgor ICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50L1ByaXZhdGVD bGlja01lYXN1cmVtZW50TWFuYWdlci5oOgorCiAyMDIxLTA5LTA3ICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IG9yaWdpbiBwYXJ0aXRpb25pbmcg KHRvcC1vcmlnaW4vZnJhbWUtb3JpZ2luKSBmb3IgQnJvYWRjYXN0Q2hhbm5lbApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcAppbmRleCA1MmY2YmM5 OTdlN2Q0ZGQwNDhlM2QyM2Y4MTc0NmRhNzdmZDNlZWJkLi41NDNjYWIxMDBiYzdiYzk5ZjU0MGYz OTRiZmY3MjNmYmNjZGFlYjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtTZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L05ldHdvcmtTZXNzaW9uLmNwcApAQCAtMzE2LDcgKzMxNiw3IEBAIHZvaWQgTmV0d29ya1Nlc3Np b246OnN0b3JlUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQoV2ViQ29yZTo6UHJpdmF0ZUNsaWNrTWVh c3VyZW1lCiAKIHZvaWQgTmV0d29ya1Nlc3Npb246OmhhbmRsZVByaXZhdGVDbGlja01lYXN1cmVt ZW50Q29udmVyc2lvbihQcml2YXRlQ2xpY2tNZWFzdXJlbWVudDo6QXR0cmlidXRpb25UcmlnZ2Vy RGF0YSYmIGF0dHJpYnV0aW9uVHJpZ2dlckRhdGEsIGNvbnN0IFVSTCYgcmVxdWVzdFVSTCwgY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZWRpcmVjdFJlcXVlc3QpCiB7Ci0gICAgcHJp dmF0ZUNsaWNrTWVhc3VyZW1lbnQoKS5oYW5kbGVBdHRyaWJ1dGlvbihXVEZNb3ZlKGF0dHJpYnV0 aW9uVHJpZ2dlckRhdGEpLCByZXF1ZXN0VVJMLCByZWRpcmVjdFJlcXVlc3QpOworICAgIHByaXZh dGVDbGlja01lYXN1cmVtZW50KCkuaGFuZGxlQXR0cmlidXRpb24oV1RGTW92ZShhdHRyaWJ1dGlv blRyaWdnZXJEYXRhKSwgcmVxdWVzdFVSTCwgUmVnaXN0cmFibGVEb21haW4ocmVkaXJlY3RSZXF1 ZXN0LnVybCgpKSwgcmVkaXJlY3RSZXF1ZXN0LmZpcnN0UGFydHlGb3JDb29raWVzKCkpOwogfQog CiB2b2lkIE5ldHdvcmtTZXNzaW9uOjpkdW1wUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQoQ29tcGxl dGlvbkhhbmRsZXI8dm9pZChTdHJpbmcpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Q cml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1h bmFnZXIuY3BwCmluZGV4IDRlZGY2MjU3NjYyNzI5M2JiYWM1ZDdkOTFiZGM5ZmU3NmVkNjJjMTUu LjVjMGM4NzQ1NTMzMjlhMDhhNDU5ODIyMjY5M2ZhMjdjMjVmMTU4NjcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0 ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50L1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFu YWdlci5jcHAKQEAgLTIzMCwxNCArMjMwLDExIEBAIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1l bnRNYW5hZ2VyOjptaWdyYXRlUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRGcm9tTGVnYWN5U3RvCiAg ICAgc3RvcmUoKS5pbnNlcnRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudChXVEZNb3ZlKG1lYXN1cmVt ZW50KSwgdHlwZSk7CiB9CiAKLXZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpo YW5kbGVBdHRyaWJ1dGlvbihBdHRyaWJ1dGlvblRyaWdnZXJEYXRhJiYgYXR0cmlidXRpb25Ucmln Z2VyRGF0YSwgY29uc3QgVVJMJiByZXF1ZXN0VVJMLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJl cXVlc3QmIHJlZGlyZWN0UmVxdWVzdCkKK3ZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5h Z2VyOjpoYW5kbGVBdHRyaWJ1dGlvbihBdHRyaWJ1dGlvblRyaWdnZXJEYXRhJiYgYXR0cmlidXRp b25UcmlnZ2VyRGF0YSwgY29uc3QgVVJMJiByZXF1ZXN0VVJMLCBXZWJDb3JlOjpSZWdpc3RyYWJs ZURvbWFpbiYmIHJlZGlyZWN0RG9tYWluLCBjb25zdCBVUkwmIGZpcnN0UGFydHlVUkwpCiB7CiAg ICAgaWYgKCFmZWF0dXJlRW5hYmxlZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBSZWdpc3Ry YWJsZURvbWFpbiByZWRpcmVjdERvbWFpbiB7IHJlZGlyZWN0UmVxdWVzdC51cmwoKSB9OwotICAg IGF1dG8mIGZpcnN0UGFydHlVUkwgPSByZWRpcmVjdFJlcXVlc3QuZmlyc3RQYXJ0eUZvckNvb2tp ZXMoKTsKLQogICAgIGlmICghcmVkaXJlY3REb21haW4ubWF0Y2hlcyhyZXF1ZXN0VVJMKSkgewog ICAgICAgICBtX2NsaWVudC0+YnJvYWRjYXN0Q29uc29sZU1lc3NhZ2UoTWVzc2FnZUxldmVsOjpX YXJuaW5nLCAiW1ByaXZhdGUgQ2xpY2sgTWVhc3VyZW1lbnRdIFRyaWdnZXJpbmcgZXZlbnQgd2Fz IG5vdCBhY2NlcHRlZCBiZWNhdXNlIHRoZSBIVFRQIHJlZGlyZWN0IHdhcyBub3Qgc2FtZS1zaXRl LiJfcyk7CiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRN YW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1 cmVtZW50L1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5oCmluZGV4IDExMGI3ZTNkYjM4 MzhiNzQ1Mjc1NmRmYTQ3MjIzMDVhZDA0NzllNzguLmJiODIyMmMyYzlkYmIwNzcyYmQzOWU3OWY0 NDMwNWY0NzBiZTlmNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmgK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVu dC9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIuaApAQCAtNTgsNyArNTgsNyBAQCBwdWJs aWM6CiAgICAgflByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcigpOwogCiAgICAgdm9pZCBz dG9yZVVuYXR0cmlidXRlZChQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCYmKTsKLSAgICB2b2lkIGhh bmRsZUF0dHJpYnV0aW9uKEF0dHJpYnV0aW9uVHJpZ2dlckRhdGEmJiwgY29uc3QgVVJMJiByZXF1 ZXN0VVJMLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlZGlyZWN0UmVxdWVzdCk7 CisgICAgdm9pZCBoYW5kbGVBdHRyaWJ1dGlvbihBdHRyaWJ1dGlvblRyaWdnZXJEYXRhJiYsIGNv bnN0IFVSTCYgcmVxdWVzdFVSTCwgV2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4mJiByZWRpcmVj dERvbWFpbiwgY29uc3QgVVJMJiBmaXJzdFBhcnR5VVJMKTsKICAgICB2b2lkIGNsZWFyKENvbXBs ZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CiAgICAgdm9pZCBjbGVhckZvclJlZ2lzdHJhYmxlRG9t YWluKGNvbnN0IFJlZ2lzdHJhYmxlRG9tYWluJiwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYm KTsKICAgICB2b2lkIG1pZ3JhdGVQcml2YXRlQ2xpY2tNZWFzdXJlbWVudEZyb21MZWdhY3lTdG9y YWdlKFByaXZhdGVDbGlja01lYXN1cmVtZW50JiYsIFByaXZhdGVDbGlja01lYXN1cmVtZW50QXR0 cmlidXRpb25UeXBlKTsK