194936 2019-02-22 00:35:29 -0800 Remove unnecessary WTF:: prefixes in CachedTypes 2019-02-25 12:20:26 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 194706 1 tzagallo tzagallo commit-queue ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1508926 0 tzagallo 2019-02-22 00:35:29 -0800 ... 1508927 1 362703 tzagallo 2019-02-22 00:40:10 -0800 Created attachment 362703 Patch 1509662 2 362906 tzagallo 2019-02-25 10:12:44 -0800 Created attachment 362906 Patch Rebase 1509722 3 362906 saam 2019-02-25 11:34:13 -0800 Comment on attachment 362906 Patch r=me 1509739 4 362906 commit-queue 2019-02-25 12:13:08 -0800 Comment on attachment 362906 Patch Clearing flags on attachment: 362906 Committed r242053: <https://trac.webkit.org/changeset/242053> 1509740 5 commit-queue 2019-02-25 12:13:09 -0800 All reviewed patches have been landed. Closing bug. 1509746 6 webkit-bug-importer 2019-02-25 12:20:26 -0800 <rdar://problem/48372573> 362703 2019-02-22 00:40:10 -0800 2019-02-25 10:12:40 -0800 Patch bug-194936-20190222093926.patch text/plain 4873 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxOTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3 MTZiZWNjYzRjMTVkMzMzY2FkMDRkNjlhYTNhMmJkOTJlMzQxNTMwLi4yYzIxMmRkODg1MjQyMWYw ZGFkYjZjOGI4YjZlOWRlNWEyYTBmZGQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxOS0wMi0yMiAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv bT4KKworICAgICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgV1RGOjogcHJlZml4ZXMgaW4gQ2FjaGVk VHlwZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 NDkzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENs ZWFudXAgdW5uZWNlc3NhcnkgcHJlZml4ZXMgZnJvbSBPcHRpb25hbCwgcm91bmRVcFRvTXVsdGlw bGVPZiBhbmQKKyAgICAgICAgcGFnZVNpemUuCisKKyAgICAgICAgKiBydW50aW1lL0NhY2hlZFR5 cGVzLmNwcDoKKyAgICAgICAgKEpTQzo6RW5jb2Rlcjo6Y2FjaGVkT2Zmc2V0Rm9yUHRyKToKKyAg ICAgICAgKEpTQzo6RW5jb2Rlcjo6UGFnZTo6bWFsbG9jKToKKyAgICAgICAgKEpTQzo6RW5jb2Rl cjo6YWxsb2NhdGVOZXdQYWdlKToKKyAgICAgICAgKEpTQzo6Q2FjaGVkUHRyOjplbmNvZGUpOgor ICAgICAgICAoSlNDOjpDYWNoZWRQdHI6OmRlY29kZSBjb25zdCk6CisgICAgICAgIChKU0M6OkNh Y2hlZE9wdGlvbmFsOjplbmNvZGUpOgorICAgICAgICAoSlNDOjpDYWNoZWRPcHRpb25hbDo6ZGVj b2RlIGNvbnN0KToKKwogMjAxOS0wMi0xOSAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxl LmNvbT4KIAogICAgICAgICBDYWNoZSBDb21wYWN0VmFyaWFibGVNYXA6OkhhbmRsZSBpbnN0ZWFk IG9mIFZhcmlhYmxlRW52aXJvbm1lbnQgZm9yIFVubGlua2VkRnVuY3Rpb25FeGVjdXRhYmxlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9DYWNoZWRUeXBlcy5jcHAg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9DYWNoZWRUeXBlcy5jcHAKaW5kZXggMDYz ZWZhOWQwZWFiZWYyZDYyODA0MTAwZDgwOTFjNjRmNTVhMTRkZC4uYTg3YWRjN2NjYjdlYzQ2MDcw NjFjNzYzZjNiNDMzMjIwZmQwNDQzMSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvQ2FjaGVkVHlwZXMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0NhY2hlZFR5cGVzLmNwcApAQCAtMTI3LDcgKzEyNyw3IEBAIHB1YmxpYzoKICAgICAgICAg bV9wdHJUb09mZnNldE1hcC5hZGQocHRyLCBvZmZzZXQpOwogICAgIH0KIAotICAgIFdURjo6T3B0 aW9uYWw8cHRyZGlmZl90PiBjYWNoZWRPZmZzZXRGb3JQdHIoY29uc3Qgdm9pZCogcHRyKQorICAg IE9wdGlvbmFsPHB0cmRpZmZfdD4gY2FjaGVkT2Zmc2V0Rm9yUHRyKGNvbnN0IHZvaWQqIHB0cikK ICAgICB7CiAgICAgICAgIGF1dG8gaXQgPSBtX3B0clRvT2Zmc2V0TWFwLmZpbmQocHRyKTsKICAg ICAgICAgaWYgKGl0ID09IG1fcHRyVG9PZmZzZXRNYXAuZW5kKCkpCkBAIC0xNjEsOCArMTYxLDgg QEAgcHJpdmF0ZToKICAgICAgICAgYm9vbCBtYWxsb2Moc2l6ZV90IHNpemUsIHB0cmRpZmZfdCYg cmVzdWx0KQogICAgICAgICB7CiAgICAgICAgICAgICBzaXplX3QgYWxpZ25tZW50ID0gc3RkOjpt aW4oYWxpZ25vZihzdGQ6Om1heF9hbGlnbl90KSwgc3RhdGljX2Nhc3Q8c2l6ZV90PihXVEY6OnJv dW5kVXBUb1Bvd2VyT2ZUd28oc2l6ZSkpKTsKLSAgICAgICAgICAgIHB0cmRpZmZfdCBvZmZzZXQg PSBXVEY6OnJvdW5kVXBUb011bHRpcGxlT2YoYWxpZ25tZW50LCBtX29mZnNldCk7Ci0gICAgICAg ICAgICBzaXplID0gV1RGOjpyb3VuZFVwVG9NdWx0aXBsZU9mKGFsaWdubWVudCwgc2l6ZSk7Cisg ICAgICAgICAgICBwdHJkaWZmX3Qgb2Zmc2V0ID0gcm91bmRVcFRvTXVsdGlwbGVPZihhbGlnbm1l bnQsIG1fb2Zmc2V0KTsKKyAgICAgICAgICAgIHNpemUgPSByb3VuZFVwVG9NdWx0aXBsZU9mKGFs aWdubWVudCwgc2l6ZSk7CiAgICAgICAgICAgICBpZiAoc3RhdGljX2Nhc3Q8c2l6ZV90PihvZmZz ZXQgKyBzaXplKSA+IG1fY2FwYWNpdHkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwog CkBAIC0xOTIsMTMgKzE5MiwxMyBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBhbGxvY2F0ZU5ld1Bh Z2Uoc2l6ZV90IHNpemUgPSAwKQogICAgIHsKLSAgICAgICAgc3RhdGljIHNpemVfdCBtaW5QYWdl U2l6ZSA9IFdURjo6cGFnZVNpemUoKTsKKyAgICAgICAgc3RhdGljIHNpemVfdCBtaW5QYWdlU2l6 ZSA9IHBhZ2VTaXplKCk7CiAgICAgICAgIGlmIChtX2N1cnJlbnRQYWdlKQogICAgICAgICAgICAg bV9iYXNlT2Zmc2V0ICs9IG1fY3VycmVudFBhZ2UtPnNpemUoKTsKICAgICAgICAgaWYgKHNpemUg PCBtaW5QYWdlU2l6ZSkKICAgICAgICAgICAgIHNpemUgPSBtaW5QYWdlU2l6ZTsKICAgICAgICAg ZWxzZQotICAgICAgICAgICAgc2l6ZSA9IFdURjo6cm91bmRVcFRvTXVsdGlwbGVPZihtaW5QYWdl U2l6ZSwgc2l6ZSk7CisgICAgICAgICAgICBzaXplID0gcm91bmRVcFRvTXVsdGlwbGVPZihtaW5Q YWdlU2l6ZSwgc2l6ZSk7CiAgICAgICAgIG1fcGFnZXMuYXBwZW5kKFBhZ2UgeyBzaXplIH0pOwog ICAgICAgICBtX2N1cnJlbnRQYWdlID0gJm1fcGFnZXMubGFzdCgpOwogICAgIH0KQEAgLTI0NSw3 ICsyNDUsNyBAQCBwdWJsaWM6CiAgICAgICAgIG1fb2Zmc2V0VG9QdHJNYXAuYWRkKG9mZnNldCwg cHRyKTsKICAgICB9CiAKLSAgICBXVEY6Ok9wdGlvbmFsPHZvaWQqPiBjYWNoZWRQdHJGb3JPZmZz ZXQocHRyZGlmZl90IG9mZnNldCkKKyAgICBPcHRpb25hbDx2b2lkKj4gY2FjaGVkUHRyRm9yT2Zm c2V0KHB0cmRpZmZfdCBvZmZzZXQpCiAgICAgewogICAgICAgICBhdXRvIGl0ID0gbV9vZmZzZXRU b1B0ck1hcC5maW5kKG9mZnNldCk7CiAgICAgICAgIGlmIChpdCA9PSBtX29mZnNldFRvUHRyTWFw LmVuZCgpKQpAQCAtMzc3LDcgKzM3Nyw3IEBAIHB1YmxpYzoKICAgICAgICAgaWYgKG1faXNFbXB0 eSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBpZiAoV1RGOjpPcHRpb25hbDxwdHJk aWZmX3Q+IG9mZnNldCA9IGVuY29kZXIuY2FjaGVkT2Zmc2V0Rm9yUHRyKHNyYykpIHsKKyAgICAg ICAgaWYgKE9wdGlvbmFsPHB0cmRpZmZfdD4gb2Zmc2V0ID0gZW5jb2Rlci5jYWNoZWRPZmZzZXRG b3JQdHIoc3JjKSkgewogICAgICAgICAgICAgdGhpcy0+bV9vZmZzZXQgPSAqb2Zmc2V0IC0gZW5j b2Rlci5vZmZzZXRPZigmdGhpcy0+bV9vZmZzZXQpOwogICAgICAgICAgICAgcmV0dXJuOwogICAg ICAgICB9CkBAIC0zOTYsNyArMzk2LDcgQEAgcHVibGljOgogICAgICAgICB9CiAKICAgICAgICAg cHRyZGlmZl90IGJ1ZmZlck9mZnNldCA9IGRlY29kZXIub2Zmc2V0T2YodGhpcy0+YnVmZmVyKCkp OwotICAgICAgICBpZiAoV1RGOjpPcHRpb25hbDx2b2lkKj4gcHRyID0gZGVjb2Rlci5jYWNoZWRQ dHJGb3JPZmZzZXQoYnVmZmVyT2Zmc2V0KSkgeworICAgICAgICBpZiAoT3B0aW9uYWw8dm9pZCo+ IHB0ciA9IGRlY29kZXIuY2FjaGVkUHRyRm9yT2Zmc2V0KGJ1ZmZlck9mZnNldCkpIHsKICAgICAg ICAgICAgIGlzTmV3QWxsb2NhdGlvbiA9IGZhbHNlOwogICAgICAgICAgICAgcmV0dXJuIHJlaW50 ZXJwcmV0X2Nhc3Q8U291cmNlKj4oKnB0cik7CiAgICAgICAgIH0KQEAgLTY4OSw5ICs2ODksOSBA QCBwcml2YXRlOgogfTsKIAogdGVtcGxhdGU8dHlwZW5hbWUgVD4KLWNsYXNzIENhY2hlZE9wdGlv bmFsIDogcHVibGljIFZhcmlhYmxlTGVuZ3RoT2JqZWN0PFdURjo6T3B0aW9uYWw8U291cmNlVHlw ZTxUPj4+IHsKK2NsYXNzIENhY2hlZE9wdGlvbmFsIDogcHVibGljIFZhcmlhYmxlTGVuZ3RoT2Jq ZWN0PE9wdGlvbmFsPFNvdXJjZVR5cGU8VD4+PiB7CiBwdWJsaWM6Ci0gICAgdm9pZCBlbmNvZGUo RW5jb2RlciYgZW5jb2RlciwgY29uc3QgV1RGOjpPcHRpb25hbDxTb3VyY2VUeXBlPFQ+PiYgc291 cmNlKQorICAgIHZvaWQgZW5jb2RlKEVuY29kZXImIGVuY29kZXIsIGNvbnN0IE9wdGlvbmFsPFNv dXJjZVR5cGU8VD4+JiBzb3VyY2UpCiAgICAgewogICAgICAgICBtX2lzRW1wdHkgPSAhc291cmNl OwogCkBAIC03MDEsNyArNzAxLDcgQEAgcHVibGljOgogICAgICAgICB0aGlzLT50ZW1wbGF0ZSBh bGxvY2F0ZTxUPihlbmNvZGVyKS0+ZW5jb2RlKGVuY29kZXIsICpzb3VyY2UpOwogICAgIH0KIAot ICAgIFdURjo6T3B0aW9uYWw8U291cmNlVHlwZTxUPj4gZGVjb2RlKERlY29kZXImIGRlY29kZXIp IGNvbnN0CisgICAgT3B0aW9uYWw8U291cmNlVHlwZTxUPj4gZGVjb2RlKERlY29kZXImIGRlY29k ZXIpIGNvbnN0CiAgICAgewogICAgICAgICBpZiAobV9pc0VtcHR5KQogICAgICAgICAgICAgcmV0 dXJuIFdURjo6bnVsbG9wdDsKQEAgLTcwOSw3ICs3MDksNyBAQCBwdWJsaWM6CiAgICAgICAgIHJl dHVybiB7IHRoaXMtPnRlbXBsYXRlIGJ1ZmZlcjxUPigpLT5kZWNvZGUoZGVjb2RlcikgfTsKICAg ICB9CiAKLSAgICB2b2lkIGRlY29kZShEZWNvZGVyJiBkZWNvZGVyLCBXVEY6Ok9wdGlvbmFsPFNv dXJjZVR5cGU8VD4+JiBkc3QpIGNvbnN0CisgICAgdm9pZCBkZWNvZGUoRGVjb2RlciYgZGVjb2Rl ciwgT3B0aW9uYWw8U291cmNlVHlwZTxUPj4mIGRzdCkgY29uc3QKICAgICB7CiAgICAgICAgIGRz dCA9IGRlY29kZShkZWNvZGVyKTsKICAgICB9Cg== 362906 2019-02-25 10:12:44 -0800 2019-02-25 12:13:08 -0800 Patch bug-194936-20190225191202.patch text/plain 4852 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyMDQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 MDJmOWQyYmM2YTFjY2JkOWU1YTMzYThiOWEyMzBlMGIzOWFhMWFmLi4wZmQ1YTJjMzhhNzYzZGVh YzBjNzVkODRlZGRhZmRmMDRlNjdlMmY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxOS0wMi0yMiAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv bT4KKworICAgICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgV1RGOjogcHJlZml4ZXMgaW4gQ2FjaGVk VHlwZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 NDkzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENs ZWFudXAgdW5uZWNlc3NhcnkgcHJlZml4ZXMgZnJvbSBPcHRpb25hbCwgcm91bmRVcFRvTXVsdGlw bGVPZiBhbmQKKyAgICAgICAgcGFnZVNpemUuCisKKyAgICAgICAgKiBydW50aW1lL0NhY2hlZFR5 cGVzLmNwcDoKKyAgICAgICAgKEpTQzo6RW5jb2Rlcjo6Y2FjaGVkT2Zmc2V0Rm9yUHRyKToKKyAg ICAgICAgKEpTQzo6RW5jb2Rlcjo6UGFnZTo6bWFsbG9jKToKKyAgICAgICAgKEpTQzo6RW5jb2Rl cjo6YWxsb2NhdGVOZXdQYWdlKToKKyAgICAgICAgKEpTQzo6Q2FjaGVkUHRyOjplbmNvZGUpOgor ICAgICAgICAoSlNDOjpDYWNoZWRQdHI6OmRlY29kZSBjb25zdCk6CisgICAgICAgIChKU0M6OkNh Y2hlZE9wdGlvbmFsOjplbmNvZGUpOgorICAgICAgICAoSlNDOjpDYWNoZWRPcHRpb25hbDo6ZGVj b2RlIGNvbnN0KToKKwogMjAxOS0wMi0yNCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5j b20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQ2hhbmdlIHRoZSBJbnNwZWN0b3JPdmVybGF5 IHRvIHVzZSBuYXRpdmUgcmF0aGVyIHRoYW4gY2FudmFzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9DYWNoZWRUeXBlcy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9DYWNoZWRUeXBlcy5jcHAKaW5kZXggMDYzZWZhOWQwZWFiZWYyZDYyODA0MTAw ZDgwOTFjNjRmNTVhMTRkZC4uYTg3YWRjN2NjYjdlYzQ2MDcwNjFjNzYzZjNiNDMzMjIwZmQwNDQz MSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ2FjaGVkVHlwZXMu Y3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NhY2hlZFR5cGVzLmNwcApA QCAtMTI3LDcgKzEyNyw3IEBAIHB1YmxpYzoKICAgICAgICAgbV9wdHJUb09mZnNldE1hcC5hZGQo cHRyLCBvZmZzZXQpOwogICAgIH0KIAotICAgIFdURjo6T3B0aW9uYWw8cHRyZGlmZl90PiBjYWNo ZWRPZmZzZXRGb3JQdHIoY29uc3Qgdm9pZCogcHRyKQorICAgIE9wdGlvbmFsPHB0cmRpZmZfdD4g Y2FjaGVkT2Zmc2V0Rm9yUHRyKGNvbnN0IHZvaWQqIHB0cikKICAgICB7CiAgICAgICAgIGF1dG8g aXQgPSBtX3B0clRvT2Zmc2V0TWFwLmZpbmQocHRyKTsKICAgICAgICAgaWYgKGl0ID09IG1fcHRy VG9PZmZzZXRNYXAuZW5kKCkpCkBAIC0xNjEsOCArMTYxLDggQEAgcHJpdmF0ZToKICAgICAgICAg Ym9vbCBtYWxsb2Moc2l6ZV90IHNpemUsIHB0cmRpZmZfdCYgcmVzdWx0KQogICAgICAgICB7CiAg ICAgICAgICAgICBzaXplX3QgYWxpZ25tZW50ID0gc3RkOjptaW4oYWxpZ25vZihzdGQ6Om1heF9h bGlnbl90KSwgc3RhdGljX2Nhc3Q8c2l6ZV90PihXVEY6OnJvdW5kVXBUb1Bvd2VyT2ZUd28oc2l6 ZSkpKTsKLSAgICAgICAgICAgIHB0cmRpZmZfdCBvZmZzZXQgPSBXVEY6OnJvdW5kVXBUb011bHRp cGxlT2YoYWxpZ25tZW50LCBtX29mZnNldCk7Ci0gICAgICAgICAgICBzaXplID0gV1RGOjpyb3Vu ZFVwVG9NdWx0aXBsZU9mKGFsaWdubWVudCwgc2l6ZSk7CisgICAgICAgICAgICBwdHJkaWZmX3Qg b2Zmc2V0ID0gcm91bmRVcFRvTXVsdGlwbGVPZihhbGlnbm1lbnQsIG1fb2Zmc2V0KTsKKyAgICAg ICAgICAgIHNpemUgPSByb3VuZFVwVG9NdWx0aXBsZU9mKGFsaWdubWVudCwgc2l6ZSk7CiAgICAg ICAgICAgICBpZiAoc3RhdGljX2Nhc3Q8c2l6ZV90PihvZmZzZXQgKyBzaXplKSA+IG1fY2FwYWNp dHkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCkBAIC0xOTIsMTMgKzE5MiwxMyBA QCBwcml2YXRlOgogCiAgICAgdm9pZCBhbGxvY2F0ZU5ld1BhZ2Uoc2l6ZV90IHNpemUgPSAwKQog ICAgIHsKLSAgICAgICAgc3RhdGljIHNpemVfdCBtaW5QYWdlU2l6ZSA9IFdURjo6cGFnZVNpemUo KTsKKyAgICAgICAgc3RhdGljIHNpemVfdCBtaW5QYWdlU2l6ZSA9IHBhZ2VTaXplKCk7CiAgICAg ICAgIGlmIChtX2N1cnJlbnRQYWdlKQogICAgICAgICAgICAgbV9iYXNlT2Zmc2V0ICs9IG1fY3Vy cmVudFBhZ2UtPnNpemUoKTsKICAgICAgICAgaWYgKHNpemUgPCBtaW5QYWdlU2l6ZSkKICAgICAg ICAgICAgIHNpemUgPSBtaW5QYWdlU2l6ZTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgc2l6 ZSA9IFdURjo6cm91bmRVcFRvTXVsdGlwbGVPZihtaW5QYWdlU2l6ZSwgc2l6ZSk7CisgICAgICAg ICAgICBzaXplID0gcm91bmRVcFRvTXVsdGlwbGVPZihtaW5QYWdlU2l6ZSwgc2l6ZSk7CiAgICAg ICAgIG1fcGFnZXMuYXBwZW5kKFBhZ2UgeyBzaXplIH0pOwogICAgICAgICBtX2N1cnJlbnRQYWdl ID0gJm1fcGFnZXMubGFzdCgpOwogICAgIH0KQEAgLTI0NSw3ICsyNDUsNyBAQCBwdWJsaWM6CiAg ICAgICAgIG1fb2Zmc2V0VG9QdHJNYXAuYWRkKG9mZnNldCwgcHRyKTsKICAgICB9CiAKLSAgICBX VEY6Ok9wdGlvbmFsPHZvaWQqPiBjYWNoZWRQdHJGb3JPZmZzZXQocHRyZGlmZl90IG9mZnNldCkK KyAgICBPcHRpb25hbDx2b2lkKj4gY2FjaGVkUHRyRm9yT2Zmc2V0KHB0cmRpZmZfdCBvZmZzZXQp CiAgICAgewogICAgICAgICBhdXRvIGl0ID0gbV9vZmZzZXRUb1B0ck1hcC5maW5kKG9mZnNldCk7 CiAgICAgICAgIGlmIChpdCA9PSBtX29mZnNldFRvUHRyTWFwLmVuZCgpKQpAQCAtMzc3LDcgKzM3 Nyw3IEBAIHB1YmxpYzoKICAgICAgICAgaWYgKG1faXNFbXB0eSkKICAgICAgICAgICAgIHJldHVy bjsKIAotICAgICAgICBpZiAoV1RGOjpPcHRpb25hbDxwdHJkaWZmX3Q+IG9mZnNldCA9IGVuY29k ZXIuY2FjaGVkT2Zmc2V0Rm9yUHRyKHNyYykpIHsKKyAgICAgICAgaWYgKE9wdGlvbmFsPHB0cmRp ZmZfdD4gb2Zmc2V0ID0gZW5jb2Rlci5jYWNoZWRPZmZzZXRGb3JQdHIoc3JjKSkgewogICAgICAg ICAgICAgdGhpcy0+bV9vZmZzZXQgPSAqb2Zmc2V0IC0gZW5jb2Rlci5vZmZzZXRPZigmdGhpcy0+ bV9vZmZzZXQpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CkBAIC0zOTYsNyArMzk2 LDcgQEAgcHVibGljOgogICAgICAgICB9CiAKICAgICAgICAgcHRyZGlmZl90IGJ1ZmZlck9mZnNl dCA9IGRlY29kZXIub2Zmc2V0T2YodGhpcy0+YnVmZmVyKCkpOwotICAgICAgICBpZiAoV1RGOjpP cHRpb25hbDx2b2lkKj4gcHRyID0gZGVjb2Rlci5jYWNoZWRQdHJGb3JPZmZzZXQoYnVmZmVyT2Zm c2V0KSkgeworICAgICAgICBpZiAoT3B0aW9uYWw8dm9pZCo+IHB0ciA9IGRlY29kZXIuY2FjaGVk UHRyRm9yT2Zmc2V0KGJ1ZmZlck9mZnNldCkpIHsKICAgICAgICAgICAgIGlzTmV3QWxsb2NhdGlv biA9IGZhbHNlOwogICAgICAgICAgICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8U291cmNlKj4o KnB0cik7CiAgICAgICAgIH0KQEAgLTY4OSw5ICs2ODksOSBAQCBwcml2YXRlOgogfTsKIAogdGVt cGxhdGU8dHlwZW5hbWUgVD4KLWNsYXNzIENhY2hlZE9wdGlvbmFsIDogcHVibGljIFZhcmlhYmxl TGVuZ3RoT2JqZWN0PFdURjo6T3B0aW9uYWw8U291cmNlVHlwZTxUPj4+IHsKK2NsYXNzIENhY2hl ZE9wdGlvbmFsIDogcHVibGljIFZhcmlhYmxlTGVuZ3RoT2JqZWN0PE9wdGlvbmFsPFNvdXJjZVR5 cGU8VD4+PiB7CiBwdWJsaWM6Ci0gICAgdm9pZCBlbmNvZGUoRW5jb2RlciYgZW5jb2RlciwgY29u c3QgV1RGOjpPcHRpb25hbDxTb3VyY2VUeXBlPFQ+PiYgc291cmNlKQorICAgIHZvaWQgZW5jb2Rl KEVuY29kZXImIGVuY29kZXIsIGNvbnN0IE9wdGlvbmFsPFNvdXJjZVR5cGU8VD4+JiBzb3VyY2Up CiAgICAgewogICAgICAgICBtX2lzRW1wdHkgPSAhc291cmNlOwogCkBAIC03MDEsNyArNzAxLDcg QEAgcHVibGljOgogICAgICAgICB0aGlzLT50ZW1wbGF0ZSBhbGxvY2F0ZTxUPihlbmNvZGVyKS0+ ZW5jb2RlKGVuY29kZXIsICpzb3VyY2UpOwogICAgIH0KIAotICAgIFdURjo6T3B0aW9uYWw8U291 cmNlVHlwZTxUPj4gZGVjb2RlKERlY29kZXImIGRlY29kZXIpIGNvbnN0CisgICAgT3B0aW9uYWw8 U291cmNlVHlwZTxUPj4gZGVjb2RlKERlY29kZXImIGRlY29kZXIpIGNvbnN0CiAgICAgewogICAg ICAgICBpZiAobV9pc0VtcHR5KQogICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKQEAg LTcwOSw3ICs3MDksNyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiB7IHRoaXMtPnRlbXBsYXRl IGJ1ZmZlcjxUPigpLT5kZWNvZGUoZGVjb2RlcikgfTsKICAgICB9CiAKLSAgICB2b2lkIGRlY29k ZShEZWNvZGVyJiBkZWNvZGVyLCBXVEY6Ok9wdGlvbmFsPFNvdXJjZVR5cGU8VD4+JiBkc3QpIGNv bnN0CisgICAgdm9pZCBkZWNvZGUoRGVjb2RlciYgZGVjb2RlciwgT3B0aW9uYWw8U291cmNlVHlw ZTxUPj4mIGRzdCkgY29uc3QKICAgICB7CiAgICAgICAgIGRzdCA9IGRlY29kZShkZWNvZGVyKTsK ICAgICB9Cg==