173904 2017-06-27 21:14:46 -0700 Avoid double thread dispatch in WebsiteDataStore::fetchDataForTopPrivatelyControlledDomains() 2017-06-28 00:34:46 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=173882 P2 Normal --- 1 cdumez cdumez beidson bfulgham commit-queue darin ggaren wilander oldest_to_newest 1323404 0 cdumez 2017-06-27 21:14:46 -0700 Avoid double thread dispatch in WebsiteDataStore::fetchDataForTopPrivatelyControlledDomains(). It calls fetchData() which dispatches to the main queue, then fetchDataForTopPrivatelyControlledDomains() dispatches to the background queue. It should be possible to get fetchData() to dispatch directly on the right queue. 1323405 1 313984 cdumez 2017-06-27 21:17:12 -0700 Created attachment 313984 Patch 1323461 2 313984 bfulgham 2017-06-28 00:06:22 -0700 Comment on attachment 313984 Patch R=me 1323471 3 313984 commit-queue 2017-06-28 00:34:45 -0700 Comment on attachment 313984 Patch Clearing flags on attachment: 313984 Committed r218871: <http://trac.webkit.org/changeset/218871> 1323472 4 commit-queue 2017-06-28 00:34:46 -0700 All reviewed patches have been landed. Closing bug. 313984 2017-06-27 21:17:12 -0700 2017-06-28 00:34:45 -0700 Patch bug-173904-20170627211711.patch text/plain 8802 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4ODYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMmFmODM4NTZlZDBkZDlm MmE4ZGJiMmE1NDBmYTYyNjU2NjFiNjU3OC4uMTM4NDQyOWM0N2ZjNTZjNzVkYTJlODlhM2UwZGUx MTY0YmE5ODQ0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE3LTA2LTI3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgQXZvaWQgZG91YmxlIHRocmVh ZCBkaXNwYXRjaCBpbiBXZWJzaXRlRGF0YVN0b3JlOjpmZXRjaERhdGFGb3JUb3BQcml2YXRlbHlD b250cm9sbGVkRG9tYWlucygpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNzM5MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBBdm9pZCBkb3VibGUgdGhyZWFkIGRpc3BhdGNoIGluIFdlYnNpdGVEYXRhU3Rv cmU6OmZldGNoRGF0YUZvclRvcFByaXZhdGVseUNvbnRyb2xsZWREb21haW5zKCkuCisgICAgICAg IEl0IGNhbGxzIGZldGNoRGF0YSgpIHdoaWNoIGRpc3BhdGNoZXMgdG8gdGhlIG1haW4gcXVldWUs IHRoZW4gZmV0Y2hEYXRhRm9yVG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbnMoKQorICAgICAg ICBkaXNwYXRjaGVzIHRvIHRoZSBiYWNrZ3JvdW5kIHF1ZXVlLiBJdCBzaG91bGQgYmUgcG9zc2li bGUgdG8gZ2V0IGZldGNoRGF0YSgpIHRvIGRpc3BhdGNoIGRpcmVjdGx5CisgICAgICAgIG9uIHRo ZSByaWdodCBxdWV1ZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRl RGF0YVN0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6ZmV0Y2hE YXRhKToKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6ZmV0Y2hEYXRhQW5kQXBw bHkpOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpmZXRjaERhdGFGb3JUb3BQ cml2YXRlbHlDb250cm9sbGVkRG9tYWlucyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVE YXRhL1dlYnNpdGVEYXRhU3RvcmUuaDoKKworMjAxNy0wNi0yNyAgQ2hyaXMgRHVtZXogIDxjZHVt ZXpAYXBwbGUuY29tPgorCiAgICAgICAgIE1vdmUgV2Vic2l0ZURhdGFSZWNvcmQgcHJvY2Vzc2lu ZyBvZmYtdGhyZWFkIGluIFdlYnNpdGVEYXRhU3RvcmU6OmZldGNoRGF0YUZvclRvcFByaXZhdGVs eUNvbnRyb2xsZWREb21haW5zKCkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE3Mzg4MgogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzI5ODQzNjY+CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURh dGFTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0 ZURhdGFTdG9yZS5jcHAKaW5kZXggZmFkYWE5MzNmOGFiYjBjN2E0ZWY2YTgwMWEwZDY5MDU0N2Q2 NjI2Ny4uZTZiYWNiZjRhYTFhOWZhMmMzNGUwNTc5ZGQwMjNhNjM2YWExODczMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0 YVN0b3JlLmNwcApAQCAtMTg1LDEwICsxODUsMTYgQEAgc3RhdGljIFByb2Nlc3NBY2Nlc3NUeXBl IGNvbXB1dGVXZWJQcm9jZXNzQWNjZXNzVHlwZUZvckRhdGFGZXRjaChPcHRpb25TZXQ8V2Vic2kK IAogdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpmZXRjaERhdGEoT3B0aW9uU2V0PFdlYnNpdGVEYXRh VHlwZT4gZGF0YVR5cGVzLCBPcHRpb25TZXQ8V2Vic2l0ZURhdGFGZXRjaE9wdGlvbj4gZmV0Y2hP cHRpb25zLCBGdW5jdGlvbjx2b2lkKFZlY3RvcjxXZWJzaXRlRGF0YVJlY29yZD4pPiYmIGNvbXBs ZXRpb25IYW5kbGVyKQogeworICAgIGZldGNoRGF0YUFuZEFwcGx5KGRhdGFUeXBlcywgZmV0Y2hP cHRpb25zLCBudWxscHRyLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7Cit9CisKK3ZvaWQg V2Vic2l0ZURhdGFTdG9yZTo6ZmV0Y2hEYXRhQW5kQXBwbHkoT3B0aW9uU2V0PFdlYnNpdGVEYXRh VHlwZT4gZGF0YVR5cGVzLCBPcHRpb25TZXQ8V2Vic2l0ZURhdGFGZXRjaE9wdGlvbj4gZmV0Y2hP cHRpb25zLCBSZWZQdHI8V29ya1F1ZXVlPiYmIHF1ZXVlLCBGdW5jdGlvbjx2b2lkKFZlY3RvcjxX ZWJzaXRlRGF0YVJlY29yZD4pPiYmIGFwcGx5KQorewogICAgIHN0cnVjdCBDYWxsYmFja0FnZ3Jl Z2F0b3IgZmluYWwgOiBUaHJlYWRTYWZlUmVmQ291bnRlZDxDYWxsYmFja0FnZ3JlZ2F0b3I+IHsK LSAgICAgICAgZXhwbGljaXQgQ2FsbGJhY2tBZ2dyZWdhdG9yKE9wdGlvblNldDxXZWJzaXRlRGF0 YUZldGNoT3B0aW9uPiBmZXRjaE9wdGlvbnMsIEZ1bmN0aW9uPHZvaWQoVmVjdG9yPFdlYnNpdGVE YXRhUmVjb3JkPik+JiYgY29tcGxldGlvbkhhbmRsZXIpCisgICAgICAgIGV4cGxpY2l0IENhbGxi YWNrQWdncmVnYXRvcihPcHRpb25TZXQ8V2Vic2l0ZURhdGFGZXRjaE9wdGlvbj4gZmV0Y2hPcHRp b25zLCBSZWZQdHI8V29ya1F1ZXVlPiYmIHF1ZXVlLCBGdW5jdGlvbjx2b2lkKFZlY3RvcjxXZWJz aXRlRGF0YVJlY29yZD4pPiYmIGFwcGx5KQogICAgICAgICAgICAgOiBmZXRjaE9wdGlvbnMoZmV0 Y2hPcHRpb25zKQotICAgICAgICAgICAgLCBjb21wbGV0aW9uSGFuZGxlcihXVEZNb3ZlKGNvbXBs ZXRpb25IYW5kbGVyKSkKKyAgICAgICAgICAgICwgcXVldWUoV1RGTW92ZShxdWV1ZSkpCisgICAg ICAgICAgICAsIGFwcGx5KFdURk1vdmUoYXBwbHkpKQogICAgICAgICB7CiAgICAgICAgIH0KIApA QCAtMjY3LDI3ICsyNzMsMzEgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpmZXRjaERhdGEoT3B0 aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4gZGF0YVR5cGVzLCBPcHRpb25TZXQKICAgICAgICAgICAg IGlmIChwZW5kaW5nQ2FsbGJhY2tzKQogICAgICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAg ICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtjYWxsYmFja0FnZ3JlZ2F0b3IgPSBtYWtl UmVmKCp0aGlzKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgICAgIFZlY3RvcjxXZWJzaXRlRGF0YVJl Y29yZD4gcmVjb3JkczsKKyAgICAgICAgICAgIHJlY29yZHMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0 eShtX3dlYnNpdGVEYXRhUmVjb3Jkcy5zaXplKCkpOworICAgICAgICAgICAgZm9yIChhdXRvJiBy ZWNvcmQgOiBtX3dlYnNpdGVEYXRhUmVjb3Jkcy52YWx1ZXMoKSkKKyAgICAgICAgICAgICAgICBy ZWNvcmRzLnVuY2hlY2tlZEFwcGVuZChXVEZNb3ZlKHJlY29yZCkpOwogCi0gICAgICAgICAgICAg ICAgV1RGOjpWZWN0b3I8V2Vic2l0ZURhdGFSZWNvcmQ+IHJlY29yZHM7Ci0gICAgICAgICAgICAg ICAgcmVjb3Jkcy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KGNhbGxiYWNrQWdncmVnYXRvci0+bV93 ZWJzaXRlRGF0YVJlY29yZHMuc2l6ZSgpKTsKKyAgICAgICAgICAgIGF1dG8gcHJvY2Vzc1JlY29y ZHMgPSBbYXBwbHkgPSBXVEZNb3ZlKGFwcGx5KSwgcmVjb3JkcyA9IFdURk1vdmUocmVjb3Jkcyld ICgpIG11dGFibGUgeworICAgICAgICAgICAgICAgIGFwcGx5KFdURk1vdmUocmVjb3JkcykpOwor ICAgICAgICAgICAgfTsKIAotICAgICAgICAgICAgICAgIGZvciAoYXV0byYgcmVjb3JkIDogY2Fs bGJhY2tBZ2dyZWdhdG9yLT5tX3dlYnNpdGVEYXRhUmVjb3Jkcy52YWx1ZXMoKSkKLSAgICAgICAg ICAgICAgICAgICAgcmVjb3Jkcy51bmNoZWNrZWRBcHBlbmQoV1RGTW92ZShyZWNvcmQpKTsKLQot ICAgICAgICAgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+Y29tcGxldGlvbkhhbmRsZXIoV1RG TW92ZShyZWNvcmRzKSk7Ci0gICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIGlmIChxdWV1ZSkK KyAgICAgICAgICAgICAgICBxdWV1ZS0+ZGlzcGF0Y2goV1RGTW92ZShwcm9jZXNzUmVjb3Jkcykp OworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNw YXRjaChXVEZNb3ZlKHByb2Nlc3NSZWNvcmRzKSk7CiAgICAgICAgIH0KIAogICAgICAgICBjb25z dCBPcHRpb25TZXQ8V2Vic2l0ZURhdGFGZXRjaE9wdGlvbj4gZmV0Y2hPcHRpb25zOwogCiAgICAg ICAgIHVuc2lnbmVkIHBlbmRpbmdDYWxsYmFja3MgPSAwOwotICAgICAgICBGdW5jdGlvbjx2b2lk KFZlY3RvcjxXZWJzaXRlRGF0YVJlY29yZD4pPiBjb21wbGV0aW9uSGFuZGxlcjsKKyAgICAgICAg UmVmUHRyPFdvcmtRdWV1ZT4gcXVldWU7CisgICAgICAgIEZ1bmN0aW9uPHZvaWQoVmVjdG9yPFdl YnNpdGVEYXRhUmVjb3JkPik+IGFwcGx5OwogCiAgICAgICAgIEhhc2hNYXA8U3RyaW5nLCBXZWJz aXRlRGF0YVJlY29yZD4gbV93ZWJzaXRlRGF0YVJlY29yZHM7CiAgICAgfTsKIAotICAgIFJlZlB0 cjxDYWxsYmFja0FnZ3JlZ2F0b3I+IGNhbGxiYWNrQWdncmVnYXRvciA9IGFkb3B0UmVmKG5ldyBD YWxsYmFja0FnZ3JlZ2F0b3IoZmV0Y2hPcHRpb25zLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVy KSkpOworICAgIFJlZlB0cjxDYWxsYmFja0FnZ3JlZ2F0b3I+IGNhbGxiYWNrQWdncmVnYXRvciA9 IGFkb3B0UmVmKG5ldyBDYWxsYmFja0FnZ3JlZ2F0b3IoZmV0Y2hPcHRpb25zLCBXVEZNb3ZlKHF1 ZXVlKSwgV1RGTW92ZShhcHBseSkpKTsKIAogI2lmIEVOQUJMRShWSURFTykKICAgICBpZiAoZGF0 YVR5cGVzLmNvbnRhaW5zKFdlYnNpdGVEYXRhVHlwZTo6RGlza0NhY2hlKSkgewpAQCAtNTEwLDIy ICs1MjAsMjIgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpmZXRjaERhdGEoT3B0aW9uU2V0PFdl YnNpdGVEYXRhVHlwZT4gZGF0YVR5cGVzLCBPcHRpb25TZXQKIAogdm9pZCBXZWJzaXRlRGF0YVN0 b3JlOjpmZXRjaERhdGFGb3JUb3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWlucyhPcHRpb25TZXQ8 V2Vic2l0ZURhdGFUeXBlPiBkYXRhVHlwZXMsIE9wdGlvblNldDxXZWJzaXRlRGF0YUZldGNoT3B0 aW9uPiBmZXRjaE9wdGlvbnMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiB0b3BQcml2YXRlbHlDb250 cm9sbGVkRG9tYWlucywgRnVuY3Rpb248dm9pZChWZWN0b3I8V2Vic2l0ZURhdGFSZWNvcmQ+JiYs IEhhc2hTZXQ8U3RyaW5nPiYmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKLSAgICBmZXRjaERh dGEoZGF0YVR5cGVzLCBmZXRjaE9wdGlvbnMsIFtxdWV1ZSA9IG1fcXVldWUuY29weVJlZigpLCB0 b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWlucyA9IENyb3NzVGhyZWFkQ29waWVyPFZlY3RvcjxT dHJpbmc+Pjo6Y29weSh0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWlucyksIGNvbXBsZXRpb25I YW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildIChhdXRvJiYgZXhpc3RpbmdEYXRh UmVjb3JkcykgbXV0YWJsZSB7Ci0gICAgICAgIHF1ZXVlLT5kaXNwYXRjaChbcXVldWUgPSBXVEZN b3ZlKHF1ZXVlKSwgdG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbnMgPSBXVEZNb3ZlKHRvcFBy aXZhdGVseUNvbnRyb2xsZWREb21haW5zKSwgZXhpc3RpbmdEYXRhUmVjb3JkcyA9IFdURk1vdmUo ZXhpc3RpbmdEYXRhUmVjb3JkcyksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0 aW9uSGFuZGxlcildICgpIG11dGFibGUgewotICAgICAgICAgICAgVmVjdG9yPFdlYnNpdGVEYXRh UmVjb3JkPiBtYXRjaGluZ0RhdGFSZWNvcmRzOwotICAgICAgICAgICAgSGFzaFNldDxTdHJpbmc+ IGRvbWFpbnNXaXRoTWF0Y2hpbmdEYXRhUmVjb3JkczsKLSAgICAgICAgICAgIGZvciAoYXV0byYm IGRhdGFSZWNvcmQgOiBleGlzdGluZ0RhdGFSZWNvcmRzKSB7Ci0gICAgICAgICAgICAgICAgZm9y IChhdXRvJiB0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluIDogdG9wUHJpdmF0ZWx5Q29udHJv bGxlZERvbWFpbnMpIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKGRhdGFSZWNvcmQubWF0Y2hl c1RvcFByaXZhdGVseUNvbnRyb2xsZWREb21haW4odG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFp bikpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIG1hdGNoaW5nRGF0YVJlY29yZHMuYXBwZW5k KFdURk1vdmUoZGF0YVJlY29yZCkpOwotICAgICAgICAgICAgICAgICAgICAgICAgZG9tYWluc1dp dGhNYXRjaGluZ0RhdGFSZWNvcmRzLmFkZCh0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluLmlz b2xhdGVkQ29weSgpKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAg ICAgICAgICAgICB9CisgICAgZmV0Y2hEYXRhQW5kQXBwbHkoZGF0YVR5cGVzLCBmZXRjaE9wdGlv bnMsIG1fcXVldWUuY29weVJlZigpLCBbdG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbnMgPSBD cm9zc1RocmVhZENvcGllcjxWZWN0b3I8U3RyaW5nPj46OmNvcHkodG9wUHJpdmF0ZWx5Q29udHJv bGxlZERvbWFpbnMpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRs ZXIpXSAoYXV0byYmIGV4aXN0aW5nRGF0YVJlY29yZHMpIG11dGFibGUgeworICAgICAgICBBU1NF UlQoIVJ1bkxvb3A6OmlzTWFpbigpKTsKKworICAgICAgICBWZWN0b3I8V2Vic2l0ZURhdGFSZWNv cmQ+IG1hdGNoaW5nRGF0YVJlY29yZHM7CisgICAgICAgIEhhc2hTZXQ8U3RyaW5nPiBkb21haW5z V2l0aE1hdGNoaW5nRGF0YVJlY29yZHM7CisgICAgICAgIGZvciAoYXV0byYmIGRhdGFSZWNvcmQg OiBleGlzdGluZ0RhdGFSZWNvcmRzKSB7CisgICAgICAgICAgICBmb3IgKGF1dG8mIHRvcFByaXZh dGVseUNvbnRyb2xsZWREb21haW4gOiB0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWlucykgewor ICAgICAgICAgICAgICAgIGlmIChkYXRhUmVjb3JkLm1hdGNoZXNUb3BQcml2YXRlbHlDb250cm9s bGVkRG9tYWluKHRvcFByaXZhdGVseUNvbnRyb2xsZWREb21haW4pKSB7CisgICAgICAgICAgICAg ICAgICAgIG1hdGNoaW5nRGF0YVJlY29yZHMuYXBwZW5kKFdURk1vdmUoZGF0YVJlY29yZCkpOwor ICAgICAgICAgICAgICAgICAgICBkb21haW5zV2l0aE1hdGNoaW5nRGF0YVJlY29yZHMuYWRkKHRv cFByaXZhdGVseUNvbnRyb2xsZWREb21haW4uaXNvbGF0ZWRDb3B5KCkpOworICAgICAgICAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW2NvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92 ZShjb21wbGV0aW9uSGFuZGxlciksIG1hdGNoaW5nRGF0YVJlY29yZHMgPSBXVEZNb3ZlKG1hdGNo aW5nRGF0YVJlY29yZHMpLCBkb21haW5zV2l0aE1hdGNoaW5nRGF0YVJlY29yZHMgPSBXVEZNb3Zl KGRvbWFpbnNXaXRoTWF0Y2hpbmdEYXRhUmVjb3JkcyldICgpIG11dGFibGUgewotICAgICAgICAg ICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKFdURk1vdmUobWF0Y2hpbmdEYXRhUmVjb3JkcyksIFdU Rk1vdmUoZG9tYWluc1dpdGhNYXRjaGluZ0RhdGFSZWNvcmRzKSk7Ci0gICAgICAgICAgICB9KTsK KyAgICAgICAgfQorICAgICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW2NvbXBsZXRpb25I YW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlciksIG1hdGNoaW5nRGF0YVJlY29yZHMg PSBXVEZNb3ZlKG1hdGNoaW5nRGF0YVJlY29yZHMpLCBkb21haW5zV2l0aE1hdGNoaW5nRGF0YVJl Y29yZHMgPSBXVEZNb3ZlKGRvbWFpbnNXaXRoTWF0Y2hpbmdEYXRhUmVjb3JkcyldICgpIG11dGFi bGUgeworICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoV1RGTW92ZShtYXRjaGluZ0RhdGFS ZWNvcmRzKSwgV1RGTW92ZShkb21haW5zV2l0aE1hdGNoaW5nRGF0YVJlY29yZHMpKTsKICAgICAg ICAgfSk7CiAgICAgfSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaAppbmRleCBlZDBjOTM0ZTQ1YzcwZmRkMDY2 OTg5ZDMyNGIxNTI5NzYwODMyOGQwLi43Y2EyNmRlZDYwYzE1ZmJkYWNhMzdhOWJlMWI4ZDc2MTM1 MGQ2ODY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEv V2Vic2l0ZURhdGFTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRl RGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgKQEAgLTEyOCw2ICsxMjgsOCBAQCBwcml2YXRlOgogICAg IGV4cGxpY2l0IFdlYnNpdGVEYXRhU3RvcmUoV2ViQ29yZTo6U2Vzc2lvbklEKTsKICAgICBleHBs aWNpdCBXZWJzaXRlRGF0YVN0b3JlKENvbmZpZ3VyYXRpb24sIFdlYkNvcmU6OlNlc3Npb25JRCk7 CiAKKyAgICB2b2lkIGZldGNoRGF0YUFuZEFwcGx5KE9wdGlvblNldDxXZWJzaXRlRGF0YVR5cGU+ LCBPcHRpb25TZXQ8V2Vic2l0ZURhdGFGZXRjaE9wdGlvbj4sIFJlZlB0cjxXb3JrUXVldWU+JiYs IEZ1bmN0aW9uPHZvaWQoVmVjdG9yPFdlYnNpdGVEYXRhUmVjb3JkPik+JiYgYXBwbHkpOworCiAg ICAgLy8gV2ViUHJvY2Vzc0xpZmV0aW1lT2JzZXJ2ZXIuCiAgICAgdm9pZCB3ZWJQYWdlV2FzQWRk ZWQoV2ViUGFnZVByb3h5Jikgb3ZlcnJpZGU7CiAgICAgdm9pZCB3ZWJQYWdlV2FzUmVtb3ZlZChX ZWJQYWdlUHJveHkmKSBvdmVycmlkZTsK