219811 2020-12-11 16:08:26 -0800 PCM: Add feature flag support in the network process 2020-12-11 17:34:59 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wilander wilander achristensen bfulgham webkit-bug-importer oldest_to_newest 1714146 0 wilander 2020-12-11 16:08:26 -0800 We should add the capability to turn PCM on and off in the network process. 1714147 1 webkit-bug-importer 2020-12-11 16:08:51 -0800 <rdar://problem/72242633> 1714154 2 416064 wilander 2020-12-11 16:19:48 -0800 Created attachment 416064 Patch 1714172 3 416064 achristensen 2020-12-11 16:51:40 -0800 Comment on attachment 416064 Patch This is ok, but it might be worth moving to WebsiteDataStoreParameters instead of NetworkProcessCreationParameters so the boolean can live on the PrivateClickMeasurementManager instead of NetworkProcess. 1714176 4 416064 wilander 2020-12-11 16:56:15 -0800 Comment on attachment 416064 Patch Thanks, Alex! 1714198 5 ews-feeder 2020-12-11 17:34:58 -0800 Committed r270723: <https://trac.webkit.org/changeset/270723> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416064. 416064 2020-12-11 16:19:48 -0800 2020-12-11 17:34:59 -0800 Patch bug-219811-20201211161947.patch text/plain 9987 wilander U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNzEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU3YjI2MGFjMmNjYzA4NGRk OTQzZDMwYTY4ODhhMzU3NTA2MmFkZjEuLjNkOGUxZDI4ODdmZjg5OGM3MTQ2MDVmZGMxY2ZlMzU5 M2JiZThjMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAgQEAKKzIwMjAtMTItMTEgIEpvaG4gV2ls YW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CisKKyAgICAgICAgUENNOiBBZGQgZmVhdHVyZSBm bGFnIHN1cHBvcnQgaW4gdGhlIG5ldHdvcmsgcHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5ODExCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS83MjI0MjYzMz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBObyBuZXcgdGVzdHMuIFRoaXMganVzdCBmb3J3YXJkcyBhIHByZWZlcmVuY2UgdG8gdGhl IG5ldHdvcmsgcHJvY2Vzcy4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9j ZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OmluaXRpYWxpemVOZXR3 b3JrUHJvY2Vzcyk6CisgICAgICAgICAgICBTdG9yZXMgdGhlIGluY29taW5nIGVuYWJsZVByaXZh dGVDbGlja01lYXN1cmVtZW50IGZyb20KKyAgICAgICAgICAgIFdlYktpdDo6TmV0d29ya1Byb2Nl c3NDcmVhdGlvblBhcmFtZXRlcnMuCisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjpz ZXRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudEVuYWJsZWQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3 b3JrUHJvY2Vzczo6cHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRFbmFibGVkIGNvbnN0KToKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5oOgorICAgICAgICAqIE5ldHdvcmtQ cm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgICAg IE5ldyBmaWVsZCBlbmFibGVQcml2YXRlQ2xpY2tNZWFzdXJlbWVudC4KKyAgICAgICAgKFdlYktp dDo6TmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSBjb25zdCk6CisgICAg ICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOgor ICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJz Lmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5h Z2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2Vy OjpzdG9yZVVuYXR0cmlidXRlZCk6CisgICAgICAgICAgICBFYXJseSByZXR1cm4gaWYgdGhlIGZl YXR1cmUgaXMgbm90IGVuYWJsZWQuCisgICAgICAgIChXZWJLaXQ6OlByaXZhdGVDbGlja01lYXN1 cmVtZW50TWFuYWdlcjo6aGFuZGxlQXR0cmlidXRpb24pOgorICAgICAgICAgICAgRWFybHkgcmV0 dXJuIGlmIHRoZSBmZWF0dXJlIGlzIG5vdCBlbmFibGVkLgorICAgICAgICAoV2ViS2l0OjpQcml2 YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmZpcmVDb252ZXJzaW9uUmVxdWVzdCk6CisgICAg ICAgICAgICBFYXJseSByZXR1cm4gaWYgdGhlIGZlYXR1cmUgaXMgbm90IGVuYWJsZWQuCisgICAg ICAgIChXZWJLaXQ6OlByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6ZmVhdHVyZUVuYWJs ZWQgY29uc3QpOgorICAgICAgICAgICAgTmV3IGNvbnZlbmllbmNlIGZ1bmN0aW9uLgorICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tOgorICAgICAgICAo V2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1Jbml0aWFsaXplTmV0d29ya1Byb2Nlc3Mp OgorICAgICAgICAgICAgU2V0cyB0aGUgbmV3IGVuYWJsZVByaXZhdGVDbGlja01lYXN1cmVtZW50 IGluCisgICAgICAgICAgICBXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJz LgorCiAyMDIwLTEyLTExICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAg ICAgICAgIEV4cG9zZSBBUEkgZm9yIGVuYWJsaW5nL2Rpc2FibGluZyBQcml2YXRlIENsaWNrIE1l YXN1cmVtZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdv cmtQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nl c3MuY3BwCmluZGV4IDVmZTQ1OTEzMTU0YmE3NTFmY2Q5NmNhNGRhOTVmNjJmMTUxMWZlZmQuLmQ4 ZDA4NDM5Y2M5ZTA3NGM5NDFhMWRhZGZiMGRkOWMxYmMyOGVhMmIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCkBAIC0zMzAsNiArMzMwLDcg QEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6aW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzKE5ldHdvcmtQ cm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiYKIAogICAgIHNldENhY2hlTW9kZWwocGFyYW1ldGVy cy5jYWNoZU1vZGVsKTsKIAorICAgIHNldFByaXZhdGVDbGlja01lYXN1cmVtZW50RW5hYmxlZChw YXJhbWV0ZXJzLmVuYWJsZVByaXZhdGVDbGlja01lYXN1cmVtZW50KTsKICAgICBzZXRQcml2YXRl Q2xpY2tNZWFzdXJlbWVudERlYnVnTW9kZShwYXJhbWV0ZXJzLmVuYWJsZVByaXZhdGVDbGlja01l YXN1cmVtZW50RGVidWdNb2RlKTsKIAogICAgIGZvciAoYXV0byYgc3VwcGxlbWVudCA6IG1fc3Vw cGxlbWVudHMudmFsdWVzKCkpCkBAIC0xMzEzLDYgKzEzMTQsMTYgQEAgdm9pZCBOZXR3b3JrUHJv Y2Vzczo6c2V0VGhpcmRQYXJ0eUNOQU1FRG9tYWluRm9yVGVzdGluZyhQQUw6OlNlc3Npb25JRCBz ZXNzaW9uSUQKIH0KICNlbmRpZiAvLyBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQog Cit2b2lkIE5ldHdvcmtQcm9jZXNzOjpzZXRQcml2YXRlQ2xpY2tNZWFzdXJlbWVudEVuYWJsZWQo Ym9vbCBlbmFibGVkKQoreworICAgIG1fcHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRFbmFibGVkID0g ZW5hYmxlZDsKK30KKworYm9vbCBOZXR3b3JrUHJvY2Vzczo6cHJpdmF0ZUNsaWNrTWVhc3VyZW1l bnRFbmFibGVkKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9wcml2YXRlQ2xpY2tNZWFzdXJlbWVu dEVuYWJsZWQ7Cit9CisKIHZvaWQgTmV0d29ya1Byb2Nlc3M6OnNldFByaXZhdGVDbGlja01lYXN1 cmVtZW50RGVidWdNb2RlKGJvb2wgZGVidWdNb2RlKQogewogICAgIGlmIChSdW50aW1lRW5hYmxl ZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLnByaXZhdGVDbGlja01lYXN1cmVtZW50RGVidWdN b2RlRW5hYmxlZCgpID09IGRlYnVnTW9kZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya1Byb2Nlc3MuaAppbmRleCAwNTM1NzEyMmM2ZTk2NjZiNDRlODkyY2Q1ZmE1NzI0 YjE0NWVlODQxLi44NmVkNzNjMWUyMzJmYmVjYWUyMzFhNjA5NTFjY2E4NmI1ZTY1MmU2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmgKKysr IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5oCkBAIC0yNzYs NiArMjc2LDggQEAgcHVibGljOgogICAgIHZvaWQgc2V0VGhpcmRQYXJ0eUNOQU1FRG9tYWluRm9y VGVzdGluZyhQQUw6OlNlc3Npb25JRCwgV2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4mJiwgQ29t cGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKICNlbmRpZgogCisgICAgdm9pZCBzZXRQcml2YXRl Q2xpY2tNZWFzdXJlbWVudEVuYWJsZWQoYm9vbCk7CisgICAgYm9vbCBwcml2YXRlQ2xpY2tNZWFz dXJlbWVudEVuYWJsZWQoKSBjb25zdDsKICAgICB2b2lkIHNldFByaXZhdGVDbGlja01lYXN1cmVt ZW50RGVidWdNb2RlKGJvb2wpOwogCiAgICAgdXNpbmcgQ2FjaGVTdG9yYWdlUm9vdFBhdGhDYWxs YmFjayA9IENvbXBsZXRpb25IYW5kbGVyPHZvaWQoU3RyaW5nJiYpPjsKQEAgLTU5MCw2ICs1OTIs OCBAQCBwcml2YXRlOgogICAgIFNlY29uZHMgbV9zZXJ2aWNlV29ya2VyRmV0Y2hUaW1lb3V0IHsg ZGVmYXVsdFNlcnZpY2VXb3JrZXJGZXRjaFRpbWVvdXQgfTsKIAogICAgIEhhc2hNYXA8V2ViQ29y ZTo6UGFnZUlkZW50aWZpZXIsIFZlY3RvcjxXZWJDb3JlOjpVc2VyQ29udGVudFVSTFBhdHRlcm4+ PiBtX2V4dGVuc2lvbkNPUlNEaXNhYmxpbmdQYXR0ZXJuczsKKworICAgIGJvb2wgbV9wcml2YXRl Q2xpY2tNZWFzdXJlbWVudEVuYWJsZWQgeyB0cnVlIH07CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBX ZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1By b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAKaW5kZXggZmRhODE1MGQwOTFm MTUwMDQ5MmVkZGY5NWRhNTY4YTM1YTIzMWQxNS4uZmZiMjI3ZWI3MmJiMTAzNWIxMTgzNTQ3YWI1 YWFhZTA4MWNhMzZmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAKQEAgLTY1 LDYgKzY1LDcgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2Rl KElQQzo6RW5jb2RlciYgZW5jb2RlcikgY29uc3QKICAgICBlbmNvZGVyIDw8IHVybFNjaGVtZXNS ZWdpc3RlcmVkQXNMb2NhbDsKICAgICBlbmNvZGVyIDw8IHVybFNjaGVtZXNSZWdpc3RlcmVkQXNO b0FjY2VzczsKIAorICAgIGVuY29kZXIgPDwgZW5hYmxlUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQ7 CiAgICAgZW5jb2RlciA8PCBlbmFibGVQcml2YXRlQ2xpY2tNZWFzdXJlbWVudERlYnVnTW9kZTsK IH0KIApAQCAtMTI1LDYgKzEyNiw4IEBAIGJvb2wgTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFt ZXRlcnM6OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIsIE5ldHdvcmtQcm9jCiAgICAgaWYg KCFkZWNvZGVyLmRlY29kZShyZXN1bHQudXJsU2NoZW1lc1JlZ2lzdGVyZWRBc05vQWNjZXNzKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQu ZW5hYmxlUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQpKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuZW5hYmxlUHJpdmF0ZUNsaWNrTWVhc3VyZW1l bnREZWJ1Z01vZGUpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMu aCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3NDcmVhdGlvblBh cmFtZXRlcnMuaAppbmRleCBiMDRmYzRjMWQ2ZmEzOTkxNzAwY2VlZGJiMDQ5NWFjMzRiZGJlYWU1 Li5jYmMyODA3ZjE2NGY3YmQ3MGM2OWFiMTdjMmRiYjg4NmViZTM3YjM5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0 ZXJzLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzc0Ny ZWF0aW9uUGFyYW1ldGVycy5oCkBAIC03OSw2ICs3OSw3IEBAIHN0cnVjdCBOZXR3b3JrUHJvY2Vz c0NyZWF0aW9uUGFyYW1ldGVycyB7CiAgICAgVmVjdG9yPFN0cmluZz4gdXJsU2NoZW1lc1JlZ2lz dGVyZWRBc0xvY2FsOwogICAgIFZlY3RvcjxTdHJpbmc+IHVybFNjaGVtZXNSZWdpc3RlcmVkQXNO b0FjY2VzczsKIAorICAgIGJvb2wgZW5hYmxlUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQgeyB0cnVl IH07CiAgICAgYm9vbCBlbmFibGVQcml2YXRlQ2xpY2tNZWFzdXJlbWVudERlYnVnTW9kZSB7IGZh bHNlIH07CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1By aXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL1ByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5jcHAKaW5kZXggZjhmNmYyNDY5 MzZkOTg4MWYwNzZiZGJkODAzOTExMzIwNGFjZWNiNC4uYzgwZGQwZWQ2OWNlYTFiOWVjYjdmNTU3 NDI4NzFlZGY3ODZhN2I4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyLmNwcApAQCAtNjcs NiArNjcsOSBAQCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OlByaXZhdGVDbGlja01l YXN1cmVtZW50TWFuYWdlcihOZXR3b3JrU2Vzc2lvbiYgbgogCiB2b2lkIFByaXZhdGVDbGlja01l YXN1cmVtZW50TWFuYWdlcjo6c3RvcmVVbmF0dHJpYnV0ZWQoUHJpdmF0ZUNsaWNrTWVhc3VyZW1l bnQmJiBhdHRyaWJ1dGlvbikKIHsKKyAgICBpZiAoIWZlYXR1cmVFbmFibGVkKCkpCisgICAgICAg IHJldHVybjsKKwogICAgIGNsZWFyRXhwaXJlZCgpOwogCiAgICAgaWYgKFVOTElLRUxZKGRlYnVn TW9kZUVuYWJsZWQoKSkpIHsKQEAgLTgyLDcgKzg1LDcgQEAgdm9pZCBQcml2YXRlQ2xpY2tNZWFz dXJlbWVudE1hbmFnZXI6OnN0b3JlVW5hdHRyaWJ1dGVkKFByaXZhdGVDbGlja01lYXN1cmVtZW50 JiYKIAogdm9pZCBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmhhbmRsZUF0dHJpYnV0 aW9uKEF0dHJpYnV0aW9uVHJpZ2dlckRhdGEmJiBhdHRyaWJ1dGlvblRyaWdnZXJEYXRhLCBjb25z dCBVUkwmIHJlcXVlc3RVUkwsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVkaXJl Y3RSZXF1ZXN0KQogewotICAgIGlmIChtX3Nlc3Npb25JRC5pc0VwaGVtZXJhbCgpKQorICAgIGlm ICghZmVhdHVyZUVuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgUmVnaXN0cmFibGVE b21haW4gcmVkaXJlY3REb21haW4geyByZWRpcmVjdFJlcXVlc3QudXJsKCkgfTsKQEAgLTEzNiw2 ICsxMzksOSBAQCB2b2lkIFByaXZhdGVDbGlja01lYXN1cmVtZW50TWFuYWdlcjo6YXR0cmlidXRl KGNvbnN0IFNvdXJjZVNpdGUmIHNvdXJjZVNpdGUsIGNvbgogCiB2b2lkIFByaXZhdGVDbGlja01l YXN1cmVtZW50TWFuYWdlcjo6ZmlyZUNvbnZlcnNpb25SZXF1ZXN0KGNvbnN0IFByaXZhdGVDbGlj a01lYXN1cmVtZW50JiBhdHRyaWJ1dGlvbikKIHsKKyAgICBpZiAoIWZlYXR1cmVFbmFibGVkKCkp CisgICAgICAgIHJldHVybjsKKwogICAgIGF1dG8gYXR0cmlidXRpb25VUkwgPSBtX2F0dHJpYnV0 aW9uQmFzZVVSTEZvclRlc3RpbmcgPyAqbV9hdHRyaWJ1dGlvbkJhc2VVUkxGb3JUZXN0aW5nIDog YXR0cmlidXRpb24ucmVwb3J0VVJMKCk7CiAgICAgaWYgKGF0dHJpYnV0aW9uVVJMLmlzRW1wdHko KSB8fCAhYXR0cmlidXRpb25VUkwuaXNWYWxpZCgpKQogICAgICAgICByZXR1cm47CkBAIC0yODks NiArMjk1LDExIEBAIHZvaWQgUHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRNYW5hZ2VyOjptYXJrQWxs VW5hdHRyaWJ1dGVkQXNFeHBpcmVkRm9yVGVzdGluZygpCiAjZW5kaWYKIH0KIAorYm9vbCBQcml2 YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXI6OmZlYXR1cmVFbmFibGVkKCkgY29uc3QKK3sKKyAg ICByZXR1cm4gbV9uZXR3b3JrUHJvY2Vzcy0+cHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnRFbmFibGVk KCkgJiYgIW1fc2Vzc2lvbklELmlzRXBoZW1lcmFsKCk7Cit9CisKIGJvb2wgUHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnRNYW5hZ2VyOjpkZWJ1Z01vZGVFbmFibGVkKCkgY29uc3QKIHsKICAgICByZXR1 cm4gUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5wcml2YXRlQ2xpY2tN ZWFzdXJlbWVudERlYnVnTW9kZUVuYWJsZWQoKSAmJiAhbV9zZXNzaW9uSUQuaXNFcGhlbWVyYWwo KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnRNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1ByaXZh dGVDbGlja01lYXN1cmVtZW50TWFuYWdlci5oCmluZGV4IDUzMjFjMjRmZjA2Y2M0YWRiOGM0MjM5 MTk2N2Y3N2MwNmNjNzYyMjAuLjhhM2U4NjQ5ZjU5NDgxYTlkY2JjZWFiM2IyYTZkMTdkZmFjZWRh ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvUHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnRNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9Q cml2YXRlQ2xpY2tNZWFzdXJlbWVudE1hbmFnZXIuaApAQCAtNzIsNiArNzIsNyBAQCBwcml2YXRl OgogICAgIHZvaWQgZmlyZUNvbnZlcnNpb25SZXF1ZXN0KGNvbnN0IFByaXZhdGVDbGlja01lYXN1 cmVtZW50Jik7CiAgICAgdm9pZCBmaXJlUGVuZGluZ0F0dHJpYnV0aW9uUmVxdWVzdHMoKTsKICAg ICB2b2lkIGNsZWFyRXhwaXJlZCgpOworICAgIGJvb2wgZmVhdHVyZUVuYWJsZWQoKSBjb25zdDsK ICAgICBib29sIGRlYnVnTW9kZUVuYWJsZWQoKSBjb25zdDsKICAgICB2b2lkIHVwZGF0ZVRpbWVy TGFzdEZpcmVkKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29h L1dlYlByb2Nlc3NQb29sQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9X ZWJQcm9jZXNzUG9vbENvY29hLm1tCmluZGV4IGQ4MGRiZDg5N2NmYTA1OWY1ZDU1NjJmNWNlYTEx MzI3ODY2MmQ2MjcuLjJhYTFiN2ZlYmU1ZGQ4ZjdjZGY1OTYxZTJlYTYzYWVlY2FmNjBlYmQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29j b2EubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xD b2NvYS5tbQpAQCAtNDgzLDYgKzQ4Myw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3Jt SW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzKE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhCiAgICAg cGFyYW1ldGVycy51aVByb2Nlc3NDb29raWVTdG9yYWdlSWRlbnRpZmllciA9IGlkZW50aWZ5aW5n RGF0YUZyb21Db29raWVTdG9yYWdlKFtbTlNIVFRQQ29va2llU3RvcmFnZSBzaGFyZWRIVFRQQ29v a2llU3RvcmFnZV0gX2Nvb2tpZVN0b3JhZ2VdKTsKICNlbmRpZgogCisgICAgcGFyYW1ldGVycy5l bmFibGVQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCA9ICFbZGVmYXVsdHMgb2JqZWN0Rm9yS2V5Oldl YlByZWZlcmVuY2VzS2V5Ojpwcml2YXRlQ2xpY2tNZWFzdXJlbWVudEVuYWJsZWRLZXkoKV0gfHwg W2RlZmF1bHRzIGJvb2xGb3JLZXk6V2ViUHJlZmVyZW5jZXNLZXk6OnByaXZhdGVDbGlja01lYXN1 cmVtZW50RW5hYmxlZEtleSgpXTsKICAgICBwYXJhbWV0ZXJzLmVuYWJsZVByaXZhdGVDbGlja01l YXN1cmVtZW50RGVidWdNb2RlID0gW2RlZmF1bHRzIGJvb2xGb3JLZXk6W05TU3RyaW5nIHN0cmlu Z1dpdGhGb3JtYXQ6QCJFeHBlcmltZW50YWwlQCIsIFdlYlByZWZlcmVuY2VzS2V5Ojpwcml2YXRl Q2xpY2tNZWFzdXJlbWVudERlYnVnTW9kZUVuYWJsZWRLZXkoKS5jcmVhdGVDRlN0cmluZygpLmdl dCgpXV07CiB9CiAK