229840 2021-09-02 16:32:41 -0700 Clean up PrivateClickMeasurementManager interface 2021-09-03 10:11:22 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen katherine_cheney webkit-bug-importer oldest_to_newest 1789970 0 achristensen 2021-09-02 16:32:41 -0700 Clean up PrivateClickMeasurementManager interface 1789971 1 437216 achristensen 2021-09-02 16:34:21 -0700 Created attachment 437216 Patch 1790220 2 437216 katherine_cheney 2021-09-03 10:05:01 -0700 Comment on attachment 437216 Patch r=me 1790223 3 ews-feeder 2021-09-03 10:10:49 -0700 Committed r282006 (241313@main): <https://commits.webkit.org/241313@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437216. 1790224 4 webkit-bug-importer 2021-09-03 10:11:22 -0700 <rdar://problem/82728320> 437216 2021-09-02 16:34:21 -0700 2021-09-03 10:10:49 -0700 Patch bug-229840-20210902163420.patch text/plain 12025 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxOTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDkxOTEzNzI2OWJhMDMzZjll YTRkOTg2MjFjZDU1OWQ1ZGIzOTg5MGUuLjdiMmNiZjdkNzkxYzU4ZGMyYzE2ZTdjY2U2ZDUyY2Q5 NjZmNjVjOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjEtMDktMDIgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBDbGVhbiB1cCBQ cml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIgaW50ZXJmYWNlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjk4NDAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOb3RhYmx5LCBQcml2YXRlQ2xpY2tNZWFz dXJlbWVudE1hbmFnZXI6OnN0b3JlIGlzIG5vdyBwcml2YXRlLCB3aGljaCBtYWtlcyBpdCBwb3Nz aWJsZSB0byB1c2UKKyAgICAgICAgdGhlIGludGVyZmFjZSBhbmQgaGF2ZSB0aGUgc3RvcmUgaW4g YSBkaWZmZXJlbnQgcHJvY2Vzcy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL0NsYXNzaWZp ZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmUuY3BwOgorICAgICAgICAoV2Vi S2l0OjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YWJhc2VTdG9yZTo6bWlncmF0ZURhdGFUb1BD TURhdGFiYXNlSWZOZWNlc3NhcnkpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQ cm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OnNpbXVsYXRlUmVz b3VyY2VMb2FkU3RhdGlzdGljc1Nlc3Npb25SZXN0YXJ0KToKKyAgICAgICAgKFdlYktpdDo6TmV0 d29ya1Byb2Nlc3M6OmZpcmVQcml2YXRlQ2xpY2tNZWFzdXJlbWVudFRpbWVySW1tZWRpYXRlbHkp OiBEZWxldGVkLgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmg6Cisg ICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwOgorICAgICAgICAoV2Vi S2l0OjpOZXR3b3JrU2Vzc2lvbjo6fk5ldHdvcmtTZXNzaW9uKToKKyAgICAgICAgKFdlYktpdDo6 TmV0d29ya1Nlc3Npb246OmZpcmVQcml2YXRlQ2xpY2tNZWFzdXJlbWVudFRpbWVySW1tZWRpYXRl bHlGb3JUZXN0aW5nKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb246OmZpcmVQcml2 YXRlQ2xpY2tNZWFzdXJlbWVudFRpbWVySW1tZWRpYXRlbHkpOiBEZWxldGVkLgorICAgICAgICAq IE5ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nl c3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2Vy LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjp+ UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyKToKKyAgICAgICAgKFdlYktpdDo6UHJpdmF0 ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjptaWdyYXRlUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRG cm9tTGVnYWN5U3RvcmFnZSk6CisgICAgICAgIChXZWJLaXQ6OlByaXZhdGVDbGlja01lYXN1cmVt ZW50TWFuYWdlcjo6c3RhcnRUaW1lckltbWVkaWF0ZWx5Rm9yVGVzdGluZyk6CisgICAgICAgICog TmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNrTWVhc3Vy ZW1lbnRNYW5hZ2VyLmg6CisKIDIwMjEtMDktMDIgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0 ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBNb3ZlIFByaXZhdGVDbGlja01lYXN1cmVtZW50 TWFuYWdlciBhbmQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnROZXR3b3JrTG9hZGVyIGludG8gUHJp dmF0ZUNsaWNrTWVhc3VyZW1lbnQgZGlyZWN0b3J5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNl U3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291 cmNlTG9hZFN0YXRpc3RpY3NEYXRhYmFzZVN0b3JlLmNwcAppbmRleCA2YzNhZGFhYjcyOWNiYTM2 YTg0Y2NlNjQxMjZjZTk3OWZlMjQ3MTMyLi5mMWIxOTkwMmUxYTRlYTA1YWVjMjFkYWI3MjdmOGI4 YWVlMDkyOTk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNz aWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFiYXNlU3RvcmUuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNz RGF0YWJhc2VTdG9yZS5jcHAKQEAgLTU1NiwxMSArNTU2LDExIEBAIHZvaWQgUmVzb3VyY2VMb2Fk U3RhdGlzdGljc0RhdGFiYXNlU3RvcmU6Om1pZ3JhdGVEYXRhVG9QQ01EYXRhYmFzZUlmTmVjZXNz YXJ5KCkKICAgICAgICAgICAgIGlmICghbmV0d29ya1Nlc3Npb24pCiAgICAgICAgICAgICAgICAg cmV0dXJuOwogCi0gICAgICAgICAgICBhdXRvJiBwY21TdG9yZSA9IG5ldHdvcmtTZXNzaW9uLT5w cml2YXRlQ2xpY2tNZWFzdXJlbWVudCgpLnN0b3JlKCk7CisgICAgICAgICAgICBhdXRvJiBtYW5h Z2VyID0gbmV0d29ya1Nlc3Npb24tPnByaXZhdGVDbGlja01lYXN1cmVtZW50KCk7CiAgICAgICAg ICAgICBmb3IgKGF1dG8mIHBjbSA6IFdURk1vdmUoYXR0cmlidXRlZCkpCi0gICAgICAgICAgICAg ICAgcGNtU3RvcmUuaW5zZXJ0UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQoV1RGTW92ZShwY20pLCBQ cml2YXRlQ2xpY2tNZWFzdXJlbWVudEF0dHJpYnV0aW9uVHlwZTo6QXR0cmlidXRlZCk7CisgICAg ICAgICAgICAgICAgbWFuYWdlci5taWdyYXRlUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRGcm9tTGVn YWN5U3RvcmFnZShXVEZNb3ZlKHBjbSksIFByaXZhdGVDbGlja01lYXN1cmVtZW50QXR0cmlidXRp b25UeXBlOjpBdHRyaWJ1dGVkKTsKICAgICAgICAgICAgIGZvciAoYXV0byYgcGNtIDogV1RGTW92 ZSh1bmF0dHJpYnV0ZWQpKQotICAgICAgICAgICAgICAgIHBjbVN0b3JlLmluc2VydFByaXZhdGVD bGlja01lYXN1cmVtZW50KFdURk1vdmUocGNtKSwgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRBdHRy aWJ1dGlvblR5cGU6OlVuYXR0cmlidXRlZCk7CisgICAgICAgICAgICAgICAgbWFuYWdlci5taWdy YXRlUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRGcm9tTGVnYWN5U3RvcmFnZShXVEZNb3ZlKHBjbSks IFByaXZhdGVDbGlja01lYXN1cmVtZW50QXR0cmlidXRpb25UeXBlOjpVbmF0dHJpYnV0ZWQpOwog ICAgICAgICB9KTsKIAogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrUHJvY2Vzcy5jcHAKaW5kZXggMmZiYTM0MDdiYWJmMzAxYWViMDg3NjJmOGY3NmU2OWEw M2FlNWUxMy4uNDQ1MTU4OTYwOGJkYmFhY2JkN2RmYTFiZDE2ZTA0ZWUwNDAxNzBkOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKKysr IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKQEAgLTI1 NzIsMTggKzI1NzIsMTMgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6c2V0UHJpdmF0ZUNsaWNrTWVh c3VyZW1lbnRPdmVycmlkZVRpbWVyRm9yVGVzdGluZyhQQUw6OlNlc3MKICAgICBjb21wbGV0aW9u SGFuZGxlcigpOwogfQogCi12b2lkIE5ldHdvcmtQcm9jZXNzOjpmaXJlUHJpdmF0ZUNsaWNrTWVh c3VyZW1lbnRUaW1lckltbWVkaWF0ZWx5KFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCkKLXsKLSAg ICBpZiAoYXV0byogc2Vzc2lvbiA9IG5ldHdvcmtTZXNzaW9uKHNlc3Npb25JRCkpCi0gICAgICAg IHNlc3Npb24tPmZpcmVQcml2YXRlQ2xpY2tNZWFzdXJlbWVudFRpbWVySW1tZWRpYXRlbHkoKTsK LX0KLQogdm9pZCBOZXR3b3JrUHJvY2Vzczo6c2ltdWxhdGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U2Vzc2lvblJlc3RhcnQoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBDb21wbGV0aW9uSGFuZGxl cjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgLy8gRklYTUU6IFJlbmFtZSB0 aGlzIHRvIHNpbXVsYXRlUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRTZXNzaW9uUmVzdGFydC4KICAg ICBpZiAoYXV0byogc2Vzc2lvbiA9IG5ldHdvcmtTZXNzaW9uKHNlc3Npb25JRCkpIHsKLSAgICAg ICAgc2Vzc2lvbi0+cmVjcmVhdGVQcml2YXRlQ2xpY2tNZWFzdXJlbWVudFN0b3JlKFt0aGlzLCBz ZXNzaW9uSUQsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcild ICgpIG11dGFibGUgewotICAgICAgICAgICAgZmlyZVByaXZhdGVDbGlja01lYXN1cmVtZW50VGlt ZXJJbW1lZGlhdGVseShzZXNzaW9uSUQpOworICAgICAgICBzZXNzaW9uLT5yZWNyZWF0ZVByaXZh dGVDbGlja01lYXN1cmVtZW50U3RvcmUoW3Nlc3Npb24gPSBtYWtlV2Vha1B0cigqc2Vzc2lvbiks IGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildICgpIG11dGFi bGUgeworICAgICAgICAgICAgaWYgKHNlc3Npb24pCisgICAgICAgICAgICAgICAgc2Vzc2lvbi0+ ZmlyZVByaXZhdGVDbGlja01lYXN1cmVtZW50VGltZXJJbW1lZGlhdGVseUZvclRlc3RpbmcoKTsK ICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKCk7CiAgICAgICAgIH0pOwogICAgICAgICBy ZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQ cm9jZXNzLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmgK aW5kZXggYmRkMjQ2MWI1ZTExZjI3MjQ1ZmJlOTMxNjU5MTJjZTAxZWRlZTJlOC4uYWIyYWI0NGRj NDdkNTMzYmY1MDY3ZWU2Y2UxOTMyM2IxMjZlNDc4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuaApAQCAtNTAxLDggKzUwMSw2IEBAIHByaXZhdGU6 CiAgICAgdm9pZCBzZXRJc0hvbGRpbmdMb2NrZWRGaWxlcyhib29sKTsKICNlbmRpZgogCi0gICAg dm9pZCBmaXJlUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRUaW1lckltbWVkaWF0ZWx5KFBBTDo6U2Vz c2lvbklEKTsKLQogICAgIGNsYXNzIFNlc3Npb25TdG9yYWdlUXVvdGFNYW5hZ2VyIHsKICAgICAg ICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiAgICAgcHVibGljOgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcAppbmRleCBkMDZkZDJmOWE4MzVh NGI3ZWE3ZDEzYmRlNWIzMmQ5NzRiYjI3YzM0Li41MmY2YmM5OTdlN2Q0ZGQwNDhlM2QyM2Y4MTc0 NmRhNzdmZDNlZWJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05l dHdvcmtTZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdv cmtTZXNzaW9uLmNwcApAQCAtMTQ5LDcgKzE0OSw2IEBAIE5ldHdvcmtTZXNzaW9uOjp+TmV0d29y a1Nlc3Npb24oKQogI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCiAgICAgZGVz dHJveVJlc291cmNlTG9hZFN0YXRpc3RpY3MoW10geyB9KTsKICNlbmRpZgotICAgIHByaXZhdGVD bGlja01lYXN1cmVtZW50KCkuc3RvcmUoKS5jbG9zZShbXSB7IH0pOwogICAgIGZvciAoYXV0byYg bG9hZGVyIDogc3RkOjpleGNoYW5nZShtX2tlcHRBbGl2ZUxvYWRzLCB7IH0pKQogICAgICAgICBs b2FkZXItPmFib3J0KCk7CiB9CkBAIC0zNzYsOSArMzc1LDkgQEAgdm9pZCBOZXR3b3JrU2Vzc2lv bjo6c2V0UENNRnJhdWRQcmV2ZW50aW9uVmFsdWVzRm9yVGVzdGluZyhTdHJpbmcmJiB1bmxpbmth YmxlVG8KICAgICBwcml2YXRlQ2xpY2tNZWFzdXJlbWVudCgpLnNldFBDTUZyYXVkUHJldmVudGlv blZhbHVlc0ZvclRlc3RpbmcoV1RGTW92ZSh1bmxpbmthYmxlVG9rZW4pLCBXVEZNb3ZlKHNlY3Jl dFRva2VuKSwgV1RGTW92ZShzaWduYXR1cmUpLCBXVEZNb3ZlKGtleUlEKSk7CiB9CiAKLXZvaWQg TmV0d29ya1Nlc3Npb246OmZpcmVQcml2YXRlQ2xpY2tNZWFzdXJlbWVudFRpbWVySW1tZWRpYXRl bHkoKQordm9pZCBOZXR3b3JrU2Vzc2lvbjo6ZmlyZVByaXZhdGVDbGlja01lYXN1cmVtZW50VGlt ZXJJbW1lZGlhdGVseUZvclRlc3RpbmcoKQogewotICAgIHByaXZhdGVDbGlja01lYXN1cmVtZW50 KCkuc3RhcnRUaW1lcigwX3MpOworICAgIHByaXZhdGVDbGlja01lYXN1cmVtZW50KCkuc3RhcnRU aW1lckltbWVkaWF0ZWx5Rm9yVGVzdGluZygpOwogfQogCiB2b2lkIE5ldHdvcmtTZXNzaW9uOjph ZGRLZXB0QWxpdmVMb2FkKFJlZjxOZXR3b3JrUmVzb3VyY2VMb2FkZXI+JiYgbG9hZGVyKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oIGIv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oCmluZGV4IGZjMjNm ODA3MjlkMTBiZjZlMzk5YWI3OWEyZjZhMDIwNTBiOThhMmMuLmY1YTA2MmQ5MWI2NDc0MDkyOTUz YWNmYmQyZDAyYzk3YzA4ODg0ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Nlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L05ldHdvcmtTZXNzaW9uLmgKQEAgLTEzNyw3ICsxMzcsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBt YXJrUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRzQXNFeHBpcmVkRm9yVGVzdGluZygpOwogICAgIHZv aWQgc2V0UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRFcGhlbWVyYWxNZWFzdXJlbWVudEZvclRlc3Rp bmcoYm9vbCk7CiAgICAgdm9pZCBzZXRQQ01GcmF1ZFByZXZlbnRpb25WYWx1ZXNGb3JUZXN0aW5n KFN0cmluZyYmIHVubGlua2FibGVUb2tlbiwgU3RyaW5nJiYgc2VjcmV0VG9rZW4sIFN0cmluZyYm IHNpZ25hdHVyZSwgU3RyaW5nJiYga2V5SUQpOwotICAgIHZvaWQgZmlyZVByaXZhdGVDbGlja01l YXN1cmVtZW50VGltZXJJbW1lZGlhdGVseSgpOworICAgIHZvaWQgZmlyZVByaXZhdGVDbGlja01l YXN1cmVtZW50VGltZXJJbW1lZGlhdGVseUZvclRlc3RpbmcoKTsKIAogICAgIHZvaWQgYWRkS2Vw dEFsaXZlTG9hZChSZWY8TmV0d29ya1Jlc291cmNlTG9hZGVyPiYmKTsKICAgICB2b2lkIHJlbW92 ZUtlcHRBbGl2ZUxvYWQoTmV0d29ya1Jlc291cmNlTG9hZGVyJik7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50L1ByaXZhdGVD bGlja01lYXN1cmVtZW50TWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L1ByaXZhdGVDbGlja01lYXN1cmVtZW50L1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5j cHAKaW5kZXggZWZhYzcyMTJlMTA5MTA3OTdkNWE0ODQ5YWIwMzM2ZjM5NmRkYWU2My4uMzliYTBm YjE0MWI5OTZmNDE4NTZjNmJkNTEwNDA2MTRiNDQ2YWIwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tN ZWFzdXJlbWVudE1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmNw cApAQCAtNjQsNiArNjQsMTIgQEAgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpQcml2 YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIoVW5pcXVlUmVmPFBDTTo6Q2wKICAgICBzdGFydFRp bWVyKDVfcyk7CiB9CiAKK1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6flByaXZhdGVD bGlja01lYXN1cmVtZW50TWFuYWdlcigpCit7CisgICAgaWYgKG1fc3RvcmUpCisgICAgICAgIG1f c3RvcmUtPmNsb3NlKFtdIHsgfSk7Cit9CisKIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRN YW5hZ2VyOjpzdG9yZVVuYXR0cmlidXRlZChQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCYmIG1lYXN1 cmVtZW50KQogewogICAgIGlmICghZmVhdHVyZUVuYWJsZWQoKSkKQEAgLTI0OCw2ICsyNTQsMTEg QEAgdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6Omluc2VydFByaXZhdGVDbGlj a01lYXN1cmVtZW50KFByaXZhdGVDbGlja00KICAgICBzdG9yZSgpLmluc2VydFByaXZhdGVDbGlj a01lYXN1cmVtZW50KFdURk1vdmUobWVhc3VyZW1lbnQpLCB0eXBlKTsKIH0KIAordm9pZCBQcml2 YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6Om1pZ3JhdGVQcml2YXRlQ2xpY2tNZWFzdXJlbWVu dEZyb21MZWdhY3lTdG9yYWdlKFByaXZhdGVDbGlja01lYXN1cmVtZW50JiYgbWVhc3VyZW1lbnQs IFByaXZhdGVDbGlja01lYXN1cmVtZW50QXR0cmlidXRpb25UeXBlIHR5cGUpCit7CisgICAgc3Rv cmUoKS5pbnNlcnRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudChXVEZNb3ZlKG1lYXN1cmVtZW50KSwg dHlwZSk7Cit9CisKIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpoYW5kbGVB dHRyaWJ1dGlvbihBdHRyaWJ1dGlvblRyaWdnZXJEYXRhJiYgYXR0cmlidXRpb25UcmlnZ2VyRGF0 YSwgY29uc3QgVVJMJiByZXF1ZXN0VVJMLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Qm IHJlZGlyZWN0UmVxdWVzdCkKIHsKICAgICBpZiAoIWZlYXR1cmVFbmFibGVkKCkpCkBAIC0yNzEs NiArMjgyLDExIEBAIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjpoYW5kbGVB dHRyaWJ1dGlvbihBdHRyaWJ1dGlvblRyaWdnZXJEYXRhJiYKICAgICBhdHRyaWJ1dGUoU291cmNl U2l0ZSB7IFdURk1vdmUocmVkaXJlY3REb21haW4pIH0sIEF0dHJpYnV0aW9uRGVzdGluYXRpb25T aXRlIHsgZmlyc3RQYXJ0eVVSTCB9LCBXVEZNb3ZlKGF0dHJpYnV0aW9uVHJpZ2dlckRhdGEpKTsK IH0KIAordm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OnN0YXJ0VGltZXJJbW1l ZGlhdGVseUZvclRlc3RpbmcoKQoreworICAgIHN0YXJ0VGltZXIoMF9zKTsKK30KKwogdm9pZCBQ cml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OnN0YXJ0VGltZXIoU2Vjb25kcyBzZWNvbmRz KQogewogICAgIG1fZmlyZVBlbmRpbmdBdHRyaWJ1dGlvblJlcXVlc3RzVGltZXIuc3RhcnRPbmVT aG90KG1faXNSdW5uaW5nVGVzdCA/IDBfcyA6IHNlY29uZHMpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xp Y2tNZWFzdXJlbWVudE1hbmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJp dmF0ZUNsaWNrTWVhc3VyZW1lbnQvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmgKaW5k ZXggY2JhNzc4M2QxNzg3YmU0MzY0MWU1MzIyMWQyNzIyYTJjZDBiOWZmMi4uMTEwYjdlM2RiMzgz OGI3NDUyNzU2ZGZhNDcyMjMwNWFkMDQ3OWU3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC9Qcml2YXRlQ2xpY2tNZWFzdXJl bWVudE1hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZhdGVD bGlja01lYXN1cmVtZW50L1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5oCkBAIC01Mywx MiArNTMsMTYgQEAgcHVibGljOgogICAgIHVzaW5nIFByaXZhdGVDbGlja01lYXN1cmVtZW50ID0g V2ViQ29yZTo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ7CiAgICAgdXNpbmcgUmVnaXN0cmFibGVE b21haW4gPSBXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbjsKICAgICB1c2luZyBTb3VyY2VTaXRl ID0gV2ViQ29yZTo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ6OlNvdXJjZVNpdGU7CisKICAgICBl eHBsaWNpdCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIoVW5pcXVlUmVmPFBDTTo6Q2xp ZW50PiYmLCBjb25zdCBTdHJpbmcmIHN0b3JhZ2VEaXJlY3RvcnkpOworICAgIH5Qcml2YXRlQ2xp Y2tNZWFzdXJlbWVudE1hbmFnZXIoKTsKIAogICAgIHZvaWQgc3RvcmVVbmF0dHJpYnV0ZWQoUHJp dmF0ZUNsaWNrTWVhc3VyZW1lbnQmJik7CiAgICAgdm9pZCBoYW5kbGVBdHRyaWJ1dGlvbihBdHRy aWJ1dGlvblRyaWdnZXJEYXRhJiYsIGNvbnN0IFVSTCYgcmVxdWVzdFVSTCwgY29uc3QgV2ViQ29y ZTo6UmVzb3VyY2VSZXF1ZXN0JiByZWRpcmVjdFJlcXVlc3QpOwogICAgIHZvaWQgY2xlYXIoQ29t cGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKICAgICB2b2lkIGNsZWFyRm9yUmVnaXN0cmFibGVE b21haW4oY29uc3QgUmVnaXN0cmFibGVEb21haW4mLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+ JiYpOworICAgIHZvaWQgbWlncmF0ZVByaXZhdGVDbGlja01lYXN1cmVtZW50RnJvbUxlZ2FjeVN0 b3JhZ2UoUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQmJiwgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRB dHRyaWJ1dGlvblR5cGUpOworCiAgICAgdm9pZCB0b1N0cmluZ0ZvclRlc3RpbmcoQ29tcGxldGlv bkhhbmRsZXI8dm9pZChTdHJpbmcpPiYmKSBjb25zdDsKICAgICB2b2lkIHNldE92ZXJyaWRlVGlt ZXJGb3JUZXN0aW5nKGJvb2wgdmFsdWUpIHsgbV9pc1J1bm5pbmdUZXN0ID0gdmFsdWU7IH0KICAg ICB2b2lkIHNldFRva2VuUHVibGljS2V5VVJMRm9yVGVzdGluZyhVUkwmJik7CkBAIC02OCwxNCAr NzIsMTMgQEAgcHVibGljOgogICAgIHZvaWQgbWFya0F0dHJpYnV0ZWRQcml2YXRlQ2xpY2tNZWFz dXJlbWVudHNBc0V4cGlyZWRGb3JUZXN0aW5nKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7 CiAgICAgdm9pZCBzZXRFcGhlbWVyYWxNZWFzdXJlbWVudEZvclRlc3RpbmcoYm9vbCB2YWx1ZSkg eyBtX2lzUnVubmluZ0VwaGVtZXJhbE1lYXN1cmVtZW50VGVzdCA9IHZhbHVlOyB9CiAgICAgdm9p ZCBzZXRQQ01GcmF1ZFByZXZlbnRpb25WYWx1ZXNGb3JUZXN0aW5nKFN0cmluZyYmIHVubGlua2Fi bGVUb2tlbiwgU3RyaW5nJiYgc2VjcmV0VG9rZW4sIFN0cmluZyYmIHNpZ25hdHVyZSwgU3RyaW5n JiYga2V5SUQpOwotICAgIHZvaWQgc3RhcnRUaW1lcihTZWNvbmRzKTsKLQorICAgIHZvaWQgc3Rh cnRUaW1lckltbWVkaWF0ZWx5Rm9yVGVzdGluZygpOwogICAgIHZvaWQgZGVzdHJveVN0b3JlRm9y VGVzdGluZyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwogCitwcml2YXRlOgogICAgIFBD TTo6U3RvcmUmIHN0b3JlKCk7CiAgICAgY29uc3QgUENNOjpTdG9yZSYgc3RvcmUoKSBjb25zdDsK LQotcHJpdmF0ZToKKyAgICB2b2lkIHN0YXJ0VGltZXIoU2Vjb25kcyk7CiAgICAgdm9pZCBnZXRU b2tlblB1YmxpY0tleShQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCYmLCBQcml2YXRlQ2xpY2tNZWFz dXJlbWVudDo6QXR0cmlidXRpb25SZXBvcnRFbmRwb2ludCwgUHJpdmF0ZUNsaWNrTWVhc3VyZW1l bnQ6OlBjbURhdGFDYXJyaWVkLCBGdW5jdGlvbjx2b2lkKFByaXZhdGVDbGlja01lYXN1cmVtZW50 JiYgYXR0cmlidXRpb24sIGNvbnN0IFN0cmluZyYgcHVibGljS2V5QmFzZTY0VVJMKT4mJik7CiAg ICAgdm9pZCBnZXRTaWduZWRVbmxpbmthYmxlVG9rZW4oUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQm Jik7CiAgICAgdm9pZCBpbnNlcnRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudChQcml2YXRlQ2xpY2tN ZWFzdXJlbWVudCYmLCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudEF0dHJpYnV0aW9uVHlwZSk7Cg==