174381 2017-07-11 13:14:03 -0700 Simplify primary domain lambda captures in WebResourceLoadStatisticsStore 2017-07-11 14:46:28 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez bfulgham commit-queue oldest_to_newest 1327677 0 cdumez 2017-07-11 13:14:03 -0700 Simplify primary domain lambda captures in WebResourceLoadStatisticsStore. 1327695 1 315156 cdumez 2017-07-11 13:40:12 -0700 Created attachment 315156 Patch 1327701 2 315156 bfulgham 2017-07-11 13:42:50 -0700 Comment on attachment 315156 Patch r=me, if the bots are happy. 1327754 3 315156 commit-queue 2017-07-11 14:46:27 -0700 Comment on attachment 315156 Patch Clearing flags on attachment: 315156 Committed r219365: <http://trac.webkit.org/changeset/219365> 1327755 4 commit-queue 2017-07-11 14:46:28 -0700 All reviewed patches have been landed. Closing bug. 315156 2017-07-11 13:40:12 -0700 2017-07-11 14:46:27 -0700 Patch bug-174381-20170711134011.patch text/plain 12352 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MzUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTU0NGVjYjQ5ODQzZGY2 MWEyYTk0Y2I0YWQwNjc2NjhkNmJjZDFkOS4uN2M5ZWZhN2NmODRiYjY1NmNjZWRmNDM3NDkyNTZm OTI2ZGY4YmQwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE3LTA3LTExICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxpZnkgcHJpbWFyeSBk b21haW4gbGFtYmRhIGNhcHR1cmVzIGluIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0MzgxCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 aXNvbGF0ZWRQcmltYXJ5RG9tYWluKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2Fk U3RhdGlzdGljc1N0b3JlOjpsb2dVc2VySW50ZXJhY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpX ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OmNsZWFyVXNlckludGVyYWN0aW9uKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpoYXNIYWRVc2Vy SW50ZXJhY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmU6OnNldExhc3RTZWVuKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc1N0b3JlOjpzZXRQcmV2YWxlbnRSZXNvdXJjZSk6CisgICAgICAgIChXZWJLaXQ6Oldl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6aXNQcmV2YWxlbnRSZXNvdXJjZSk6CisgICAg ICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Y2xlYXJQcmV2YWxl bnRSZXNvdXJjZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6c2V0R3JhbmRmYXRoZXJlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZTo6aXNHcmFuZGZhdGhlcmVkKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRTdWJmcmFtZVVuZGVyVG9wRnJhbWVPcmln aW4pOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNl dFN1YnJlc291cmNlVW5kZXJUb3BGcmFtZU9yaWdpbik6CisgICAgICAgIChXZWJLaXQ6OldlYlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0U3VicmVzb3VyY2VVbmlxdWVSZWRpcmVjdFRv KToKKyAgICAgICAgKFdlYktpdDo6cHJpbWFyeURvbWFpbik6IERlbGV0ZWQuCisKIDIwMTctMDct MTEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVzZXQg Y29va2llIHBhcnRpdGlvbmluZyBzdGF0ZSBhZnRlciBuZXR3b3JrIHByb2Nlc3MgY3Jhc2hlcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2Fk U3RhdGlzdGljc1N0b3JlLmNwcAppbmRleCBlMjBhOGJlMThmN2Y4MGE1MDk3NWY3ODI1YTAxNzRj NjAxMjhlOWU4Li5kMTk2NjcxOTE5NmJjMWRkOTU1MzEyMDZkN2Q2ZTZiYTAwMmQwMjg2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2Fk U3RhdGlzdGljc1N0b3JlLmNwcApAQCAtNTMsOSArNTMsOSBAQCBjb25zdGV4cHIgdW5zaWduZWQg b3BlcmF0aW5nRGF0ZXNXaW5kb3cgeyAzMCB9OwogY29uc3RleHByIHVuc2lnbmVkIHN0YXRpc3Rp Y3NNb2RlbFZlcnNpb24geyA3IH07CiBjb25zdGV4cHIgdW5zaWduZWQgbWF4SW1wb3J0YW5jZSB7 IDMgfTsKIAotdGVtcGxhdGU8dHlwZW5hbWUgVD4gc3RhdGljIGlubGluZSBTdHJpbmcgcHJpbWFy eURvbWFpbihjb25zdCBUJiB2YWx1ZSkKK3RlbXBsYXRlPHR5cGVuYW1lIFQ+IHN0YXRpYyBpbmxp bmUgU3RyaW5nIGlzb2xhdGVkUHJpbWFyeURvbWFpbihjb25zdCBUJiB2YWx1ZSkKIHsKLSAgICBy ZXR1cm4gUmVzb3VyY2VMb2FkU3RhdGlzdGljczo6cHJpbWFyeURvbWFpbih2YWx1ZSk7CisgICAg cmV0dXJuIFJlc291cmNlTG9hZFN0YXRpc3RpY3M6OnByaW1hcnlEb21haW4odmFsdWUpLmlzb2xh dGVkQ29weSgpOwogfQogCiBzdGF0aWMgY29uc3QgT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4m IGRhdGFUeXBlc1RvUmVtb3ZlKCkKQEAgLTQ2NiwxMiArNDY2LDEyIEBAIHZvaWQgV2ViUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlOjpsb2dVc2VySW50ZXJhY3Rpb24oY29uc3QgVVJMJiB1cmwp CiAgICAgaWYgKHVybC5pc0JsYW5rVVJMKCkgfHwgdXJsLmlzRW1wdHkoKSkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgbV9zdGF0aXN0aWNzUXVldWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRU aGlzID0gbWFrZVJlZigqdGhpcyksIHByaW1hcnlEb21haW5TdHJpbmcgPSBwcmltYXJ5RG9tYWlu KHVybCkuaXNvbGF0ZWRDb3B5KCldIHsKLSAgICAgICAgYXV0byYgc3RhdGlzdGljcyA9IGVuc3Vy ZVJlc291cmNlU3RhdGlzdGljc0ZvclByaW1hcnlEb21haW4ocHJpbWFyeURvbWFpblN0cmluZyk7 CisgICAgbV9zdGF0aXN0aWNzUXVldWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0g bWFrZVJlZigqdGhpcyksIHByaW1hcnlEb21haW4gPSBpc29sYXRlZFByaW1hcnlEb21haW4odXJs KV0geworICAgICAgICBhdXRvJiBzdGF0aXN0aWNzID0gZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNz Rm9yUHJpbWFyeURvbWFpbihwcmltYXJ5RG9tYWluKTsKICAgICAgICAgc3RhdGlzdGljcy5oYWRV c2VySW50ZXJhY3Rpb24gPSB0cnVlOwogICAgICAgICBzdGF0aXN0aWNzLm1vc3RSZWNlbnRVc2Vy SW50ZXJhY3Rpb25UaW1lID0gV2FsbFRpbWU6Om5vdygpOwogCi0gICAgICAgIHVwZGF0ZUNvb2tp ZVBhcnRpdGlvbmluZ0ZvckRvbWFpbnMoeyBwcmltYXJ5RG9tYWluU3RyaW5nIH0sIHsgfSwgU2hv dWxkQ2xlYXJGaXJzdDo6Tm8pOworICAgICAgICB1cGRhdGVDb29raWVQYXJ0aXRpb25pbmdGb3JE b21haW5zKHsgcHJpbWFyeURvbWFpbiB9LCB7IH0sIFNob3VsZENsZWFyRmlyc3Q6Ok5vKTsKICAg ICB9KTsKIH0KIApAQCAtNDgwLDggKzQ4MCw4IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpjbGVhclVzZXJJbnRlcmFjdGlvbihjb25zdCBVUkwmIHVybCkKICAgICBpZiAo dXJsLmlzQmxhbmtVUkwoKSB8fCB1cmwuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKLSAg ICBtX3N0YXRpc3RpY3NRdWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtl UmVmKCp0aGlzKSwgdXJsID0gdXJsLmlzb2xhdGVkQ29weSgpXSB7Ci0gICAgICAgIGF1dG8mIHN0 YXRpc3RpY3MgPSBlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKHByaW1h cnlEb21haW4odXJsKSk7CisgICAgbV9zdGF0aXN0aWNzUXVldWUtPmRpc3BhdGNoKFt0aGlzLCBw cm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIHByaW1hcnlEb21haW4gPSBpc29sYXRlZFBy aW1hcnlEb21haW4odXJsKV0geworICAgICAgICBhdXRvJiBzdGF0aXN0aWNzID0gZW5zdXJlUmVz b3VyY2VTdGF0aXN0aWNzRm9yUHJpbWFyeURvbWFpbihwcmltYXJ5RG9tYWluKTsKICAgICAgICAg c3RhdGlzdGljcy5oYWRVc2VySW50ZXJhY3Rpb24gPSBmYWxzZTsKICAgICAgICAgc3RhdGlzdGlj cy5tb3N0UmVjZW50VXNlckludGVyYWN0aW9uVGltZSA9IHsgfTsKICAgICB9KTsKQEAgLTQ5NCw4 ICs0OTQsOCBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6aGFzSGFkVXNl ckludGVyYWN0aW9uKGNvbnN0IFVSTCYgdXJsLCBXVEY6OgogICAgICAgICByZXR1cm47CiAgICAg fQogCi0gICAgbV9zdGF0aXN0aWNzUXVldWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlz ID0gbWFrZVJlZigqdGhpcyksIHVybCA9IHVybC5pc29sYXRlZENvcHkoKSwgY29tcGxldGlvbkhh bmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0gKCkgbXV0YWJsZSB7Ci0gICAgICAg IGF1dG8gbWFwRW50cnkgPSBtX3Jlc291cmNlU3RhdGlzdGljc01hcC5maW5kKHByaW1hcnlEb21h aW4odXJsKSk7CisgICAgbV9zdGF0aXN0aWNzUXVldWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0 ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIHByaW1hcnlEb21haW4gPSBpc29sYXRlZFByaW1hcnlE b21haW4odXJsKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVy KV0gKCkgbXV0YWJsZSB7CisgICAgICAgIGF1dG8gbWFwRW50cnkgPSBtX3Jlc291cmNlU3RhdGlz dGljc01hcC5maW5kKHByaW1hcnlEb21haW4pOwogICAgICAgICBib29sIGhhZFVzZXJJbnRlcmFj dGlvbiA9IG1hcEVudHJ5ID09IG1fcmVzb3VyY2VTdGF0aXN0aWNzTWFwLmVuZCgpID8gZmFsc2U6 IGhhc0hhZFVuZXhwaXJlZFJlY2VudFVzZXJJbnRlcmFjdGlvbihtYXBFbnRyeS0+dmFsdWUpOwog ICAgICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW2hhZFVzZXJJbnRlcmFjdGlvbiwgY29t cGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKV0gewogICAgICAgICAg ICAgY29tcGxldGlvbkhhbmRsZXIoaGFkVXNlckludGVyYWN0aW9uKTsKQEAgLTUwOCw4ICs1MDgs OCBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0TGFzdFNlZW4oY29u c3QgVVJMJiB1cmwsIFNlY29uZHMgc2Vjb25kcwogICAgIGlmICh1cmwuaXNCbGFua1VSTCgpIHx8 IHVybC5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKICAgICAKLSAgICBtX3N0YXRpc3RpY3NR dWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgdXJs ID0gdXJsLmlzb2xhdGVkQ29weSgpLCBzZWNvbmRzXSB7Ci0gICAgICAgIGF1dG8mIHN0YXRpc3Rp Y3MgPSBlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKHByaW1hcnlEb21h aW4odXJsKSk7CisgICAgbV9zdGF0aXN0aWNzUXVldWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0 ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIHByaW1hcnlEb21haW4gPSBpc29sYXRlZFByaW1hcnlE b21haW4odXJsKSwgc2Vjb25kc10geworICAgICAgICBhdXRvJiBzdGF0aXN0aWNzID0gZW5zdXJl UmVzb3VyY2VTdGF0aXN0aWNzRm9yUHJpbWFyeURvbWFpbihwcmltYXJ5RG9tYWluKTsKICAgICAg ICAgc3RhdGlzdGljcy5sYXN0U2VlbiA9IFdhbGxUaW1lOjpmcm9tUmF3U2Vjb25kcyhzZWNvbmRz LnNlY29uZHMoKSk7CiAgICAgfSk7CiB9CkBAIC01MTksOCArNTE5LDggQEAgdm9pZCBXZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNldFByZXZhbGVudFJlc291cmNlKGNvbnN0IFVSTCYg dXJsKQogICAgIGlmICh1cmwuaXNCbGFua1VSTCgpIHx8IHVybC5pc0VtcHR5KCkpCiAgICAgICAg IHJldHVybjsKIAotICAgIG1fc3RhdGlzdGljc1F1ZXVlLT5kaXNwYXRjaChbdGhpcywgcHJvdGVj dGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCB1cmwgPSB1cmwuaXNvbGF0ZWRDb3B5KCldIHsKLSAg ICAgICAgYXV0byYgc3RhdGlzdGljcyA9IGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0ZvclByaW1h cnlEb21haW4ocHJpbWFyeURvbWFpbih1cmwpKTsKKyAgICBtX3N0YXRpc3RpY3NRdWV1ZS0+ZGlz cGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgcHJpbWFyeURvbWFp biA9IGlzb2xhdGVkUHJpbWFyeURvbWFpbih1cmwpXSB7CisgICAgICAgIGF1dG8mIHN0YXRpc3Rp Y3MgPSBlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKHByaW1hcnlEb21h aW4pOwogICAgICAgICBzdGF0aXN0aWNzLmlzUHJldmFsZW50UmVzb3VyY2UgPSB0cnVlOwogICAg IH0pOwogfQpAQCAtNTMyLDggKzUzMiw4IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjppc1ByZXZhbGVudFJlc291cmNlKGNvbnN0IFVSTCYgdXJsLCBXVEY6OkZ1CiAgICAg ICAgIHJldHVybjsKICAgICB9CiAKLSAgICBtX3N0YXRpc3RpY3NRdWV1ZS0+ZGlzcGF0Y2goW3Ro aXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgdXJsID0gdXJsLmlzb2xhdGVkQ29w eSgpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSAoKSBt dXRhYmxlIHsKLSAgICAgICAgYXV0byBtYXBFbnRyeSA9IG1fcmVzb3VyY2VTdGF0aXN0aWNzTWFw LmZpbmQocHJpbWFyeURvbWFpbih1cmwpKTsKKyAgICBtX3N0YXRpc3RpY3NRdWV1ZS0+ZGlzcGF0 Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgcHJpbWFyeURvbWFpbiA9 IGlzb2xhdGVkUHJpbWFyeURvbWFpbih1cmwpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUo Y29tcGxldGlvbkhhbmRsZXIpXSAoKSBtdXRhYmxlIHsKKyAgICAgICAgYXV0byBtYXBFbnRyeSA9 IG1fcmVzb3VyY2VTdGF0aXN0aWNzTWFwLmZpbmQocHJpbWFyeURvbWFpbik7CiAgICAgICAgIGJv b2wgaXNQcmV2YWxlbnRSZXNvdXJjZSA9IG1hcEVudHJ5ID09IG1fcmVzb3VyY2VTdGF0aXN0aWNz TWFwLmVuZCgpID8gZmFsc2UgOiBtYXBFbnRyeS0+dmFsdWUuaXNQcmV2YWxlbnRSZXNvdXJjZTsK ICAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtpc1ByZXZhbGVudFJlc291cmNlLCBj b21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSB7CiAgICAgICAg ICAgICBjb21wbGV0aW9uSGFuZGxlcihpc1ByZXZhbGVudFJlc291cmNlKTsKQEAgLTU0Niw4ICs1 NDYsOCBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6Y2xlYXJQcmV2YWxl bnRSZXNvdXJjZShjb25zdCBVUkwmIHVybCkKICAgICBpZiAodXJsLmlzQmxhbmtVUkwoKSB8fCB1 cmwuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX3N0YXRpc3RpY3NRdWV1ZS0+ ZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgdXJsID0gdXJs Lmlzb2xhdGVkQ29weSgpXSB7Ci0gICAgICAgIGF1dG8mIHN0YXRpc3RpY3MgPSBlbnN1cmVSZXNv dXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKHByaW1hcnlEb21haW4odXJsKSk7CisgICAg bV9zdGF0aXN0aWNzUXVldWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJl ZigqdGhpcyksIHByaW1hcnlEb21haW4gPSBpc29sYXRlZFByaW1hcnlEb21haW4odXJsKV0gewor ICAgICAgICBhdXRvJiBzdGF0aXN0aWNzID0gZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9yUHJp bWFyeURvbWFpbihwcmltYXJ5RG9tYWluKTsKICAgICAgICAgc3RhdGlzdGljcy5pc1ByZXZhbGVu dFJlc291cmNlID0gZmFsc2U7CiAgICAgfSk7CiB9CkBAIC01NTcsOCArNTU3LDggQEAgdm9pZCBX ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNldEdyYW5kZmF0aGVyZWQoY29uc3QgVVJM JiB1cmwsIGJvb2wgdmFsdWUKICAgICBpZiAodXJsLmlzQmxhbmtVUkwoKSB8fCB1cmwuaXNFbXB0 eSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX3N0YXRpc3RpY3NRdWV1ZS0+ZGlzcGF0Y2go W3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgdXJsID0gdXJsLmlzb2xhdGVk Q29weSgpLCB2YWx1ZV0gewotICAgICAgICBhdXRvJiBzdGF0aXN0aWNzID0gZW5zdXJlUmVzb3Vy Y2VTdGF0aXN0aWNzRm9yUHJpbWFyeURvbWFpbihwcmltYXJ5RG9tYWluKHVybCkpOworICAgIG1f c3RhdGlzdGljc1F1ZXVlLT5kaXNwYXRjaChbdGhpcywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYo KnRoaXMpLCBwcmltYXJ5RG9tYWluID0gaXNvbGF0ZWRQcmltYXJ5RG9tYWluKHVybCksIHZhbHVl XSB7CisgICAgICAgIGF1dG8mIHN0YXRpc3RpY3MgPSBlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NG b3JQcmltYXJ5RG9tYWluKHByaW1hcnlEb21haW4pOwogICAgICAgICBzdGF0aXN0aWNzLmdyYW5k ZmF0aGVyZWQgPSB2YWx1ZTsKICAgICB9KTsKIH0KQEAgLTU3MCw4ICs1NzAsOCBAQCB2b2lkIFdl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6aXNHcmFuZGZhdGhlcmVkKGNvbnN0IFVSTCYg dXJsLCBXVEY6OkZ1bmN0aQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgbV9zdGF0aXN0 aWNzUXVldWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyks IGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlciksIHVybCA9IHVy bC5pc29sYXRlZENvcHkoKV0gKCkgbXV0YWJsZSB7Ci0gICAgICAgIGF1dG8gbWFwRW50cnkgPSBt X3Jlc291cmNlU3RhdGlzdGljc01hcC5maW5kKHByaW1hcnlEb21haW4odXJsKSk7CisgICAgbV9z dGF0aXN0aWNzUXVldWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigq dGhpcyksIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlciksIHBy aW1hcnlEb21haW4gPSBpc29sYXRlZFByaW1hcnlEb21haW4odXJsKV0gKCkgbXV0YWJsZSB7Cisg ICAgICAgIGF1dG8gbWFwRW50cnkgPSBtX3Jlc291cmNlU3RhdGlzdGljc01hcC5maW5kKHByaW1h cnlEb21haW4pOwogICAgICAgICBib29sIGlzR3JhbmRGYXRoZXJlZCA9IG1hcEVudHJ5ID09IG1f cmVzb3VyY2VTdGF0aXN0aWNzTWFwLmVuZCgpID8gZmFsc2UgOiBtYXBFbnRyeS0+dmFsdWUuZ3Jh bmRmYXRoZXJlZDsKICAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtpc0dyYW5kRmF0 aGVyZWQsIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildIHsK ICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKGlzR3JhbmRGYXRoZXJlZCk7CkBAIC01ODQs OSArNTg0LDkgQEAgdm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNldFN1YmZy YW1lVW5kZXJUb3BGcmFtZU9yaWdpbihjb25zdCBVUkwmIHMKICAgICBpZiAoc3ViZnJhbWUuaXNC bGFua1VSTCgpIHx8IHN1YmZyYW1lLmlzRW1wdHkoKSB8fCB0b3BGcmFtZS5pc0JsYW5rVVJMKCkg fHwgdG9wRnJhbWUuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX3N0YXRpc3Rp Y3NRdWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwg cHJpbWFyeVRvcEZyYW1lRG9tYWluU3RyaW5nID0gcHJpbWFyeURvbWFpbih0b3BGcmFtZSkuaXNv bGF0ZWRDb3B5KCksIHByaW1hcnlTdWJGcmFtZURvbWFpblN0cmluZyA9IHByaW1hcnlEb21haW4o c3ViZnJhbWUpLmlzb2xhdGVkQ29weSgpXSB7Ci0gICAgICAgIGF1dG8mIHN0YXRpc3RpY3MgPSBl bnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKHByaW1hcnlTdWJGcmFtZURv bWFpblN0cmluZyk7Ci0gICAgICAgIHN0YXRpc3RpY3Muc3ViZnJhbWVVbmRlclRvcEZyYW1lT3Jp Z2lucy5hZGQocHJpbWFyeVRvcEZyYW1lRG9tYWluU3RyaW5nKTsKKyAgICBtX3N0YXRpc3RpY3NR dWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtlUmVmKCp0aGlzKSwgcHJp bWFyeVRvcEZyYW1lRG9tYWluID0gaXNvbGF0ZWRQcmltYXJ5RG9tYWluKHRvcEZyYW1lKSwgcHJp bWFyeVN1YkZyYW1lRG9tYWluID0gaXNvbGF0ZWRQcmltYXJ5RG9tYWluKHN1YmZyYW1lKV0gewor ICAgICAgICBhdXRvJiBzdGF0aXN0aWNzID0gZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9yUHJp bWFyeURvbWFpbihwcmltYXJ5U3ViRnJhbWVEb21haW4pOworICAgICAgICBzdGF0aXN0aWNzLnN1 YmZyYW1lVW5kZXJUb3BGcmFtZU9yaWdpbnMuYWRkKHByaW1hcnlUb3BGcmFtZURvbWFpbik7CiAg ICAgfSk7CiB9CiAKQEAgLTU5NSw5ICs1OTUsOSBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRp c3RpY3NTdG9yZTo6c2V0U3VicmVzb3VyY2VVbmRlclRvcEZyYW1lT3JpZ2luKGNvbnN0IFVSTAog ICAgIGlmIChzdWJyZXNvdXJjZS5pc0JsYW5rVVJMKCkgfHwgc3VicmVzb3VyY2UuaXNFbXB0eSgp IHx8IHRvcEZyYW1lLmlzQmxhbmtVUkwoKSB8fCB0b3BGcmFtZS5pc0VtcHR5KCkpCiAgICAgICAg IHJldHVybjsKIAotICAgIG1fc3RhdGlzdGljc1F1ZXVlLT5kaXNwYXRjaChbdGhpcywgcHJvdGVj dGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBwcmltYXJ5VG9wRnJhbWVEb21haW5TdHJpbmcgPSBw cmltYXJ5RG9tYWluKHRvcEZyYW1lKS5pc29sYXRlZENvcHkoKSwgcHJpbWFyeVN1YnJlc291cmNl RG9tYWluU3RyaW5nID0gcHJpbWFyeURvbWFpbihzdWJyZXNvdXJjZSkuaXNvbGF0ZWRDb3B5KCld IHsKLSAgICAgICAgYXV0byYgc3RhdGlzdGljcyA9IGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0Zv clByaW1hcnlEb21haW4ocHJpbWFyeVN1YnJlc291cmNlRG9tYWluU3RyaW5nKTsKLSAgICAgICAg c3RhdGlzdGljcy5zdWJyZXNvdXJjZVVuZGVyVG9wRnJhbWVPcmlnaW5zLmFkZChwcmltYXJ5VG9w RnJhbWVEb21haW5TdHJpbmcpOworICAgIG1fc3RhdGlzdGljc1F1ZXVlLT5kaXNwYXRjaChbdGhp cywgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBwcmltYXJ5VG9wRnJhbWVEb21haW4g PSBpc29sYXRlZFByaW1hcnlEb21haW4odG9wRnJhbWUpLCBwcmltYXJ5U3VicmVzb3VyY2VEb21h aW4gPSBpc29sYXRlZFByaW1hcnlEb21haW4oc3VicmVzb3VyY2UpXSB7CisgICAgICAgIGF1dG8m IHN0YXRpc3RpY3MgPSBlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKHBy aW1hcnlTdWJyZXNvdXJjZURvbWFpbik7CisgICAgICAgIHN0YXRpc3RpY3Muc3VicmVzb3VyY2VV bmRlclRvcEZyYW1lT3JpZ2lucy5hZGQocHJpbWFyeVRvcEZyYW1lRG9tYWluKTsKICAgICB9KTsK IH0KIApAQCAtNjA2LDkgKzYwNiw5IEBAIHZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjpzZXRTdWJyZXNvdXJjZVVuaXF1ZVJlZGlyZWN0VG8oY29uc3QgVVJMJiBzCiAgICAgaWYg KHN1YnJlc291cmNlLmlzQmxhbmtVUkwoKSB8fCBzdWJyZXNvdXJjZS5pc0VtcHR5KCkgfHwgaG9z dE5hbWVSZWRpcmVjdGVkVG8uaXNCbGFua1VSTCgpIHx8IGhvc3ROYW1lUmVkaXJlY3RlZFRvLmlz RW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9zdGF0aXN0aWNzUXVldWUtPmRpc3Bh dGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIHByaW1hcnlSZWRpcmVj dERvbWFpblN0cmluZyA9IHByaW1hcnlEb21haW4oaG9zdE5hbWVSZWRpcmVjdGVkVG8pLmlzb2xh dGVkQ29weSgpLCBwcmltYXJ5U3VicmVzb3VyY2VEb21haW5TdHJpbmcgPSBwcmltYXJ5RG9tYWlu KHN1YnJlc291cmNlKS5pc29sYXRlZENvcHkoKV0gewotICAgICAgICBhdXRvJiBzdGF0aXN0aWNz ID0gZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9yUHJpbWFyeURvbWFpbihwcmltYXJ5U3VicmVz b3VyY2VEb21haW5TdHJpbmcpOwotICAgICAgICBzdGF0aXN0aWNzLnN1YnJlc291cmNlVW5pcXVl UmVkaXJlY3RzVG8uYWRkKHByaW1hcnlSZWRpcmVjdERvbWFpblN0cmluZyk7CisgICAgbV9zdGF0 aXN0aWNzUXVldWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhp cyksIHByaW1hcnlSZWRpcmVjdERvbWFpbiA9IGlzb2xhdGVkUHJpbWFyeURvbWFpbihob3N0TmFt ZVJlZGlyZWN0ZWRUbyksIHByaW1hcnlTdWJyZXNvdXJjZURvbWFpbiA9IGlzb2xhdGVkUHJpbWFy eURvbWFpbihzdWJyZXNvdXJjZSldIHsKKyAgICAgICAgYXV0byYgc3RhdGlzdGljcyA9IGVuc3Vy ZVJlc291cmNlU3RhdGlzdGljc0ZvclByaW1hcnlEb21haW4ocHJpbWFyeVN1YnJlc291cmNlRG9t YWluKTsKKyAgICAgICAgc3RhdGlzdGljcy5zdWJyZXNvdXJjZVVuaXF1ZVJlZGlyZWN0c1RvLmFk ZChwcmltYXJ5UmVkaXJlY3REb21haW4pOwogICAgIH0pOwogfQogCg==