231403 2021-10-07 17:26:06 -0700 [GPU Process] Unique RenderingResourceIdentifiers Part 2: Unroll PendingWakeupInformation::arguments 2021-10-07 18:44:02 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 217638 1 mmaxfield mmaxfield webkit-bug-importer wenson_hsieh oldest_to_newest 1801876 0 mmaxfield 2021-10-07 17:26:06 -0700 [GPU Process] Unique RenderingResourceIdentifiers Part 2: Unroll PendingWakeupInformation::arguments 1801879 1 440558 mmaxfield 2021-10-07 17:30:09 -0700 Created attachment 440558 Patch 1801881 2 webkit-bug-importer 2021-10-07 17:31:52 -0700 <rdar://problem/84007348> 1801899 3 mmaxfield 2021-10-07 18:44:02 -0700 Committed r283766 (242684@main): <https://commits.webkit.org/242684@main> 440558 2021-10-07 17:30:09 -0700 2021-10-07 17:32:42 -0700 Patch bug-231403-20211007173008.patch text/plain 12503 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNzU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU5MjA5ZWVlMDAwNjk4YWNk ZWI0MDAzNGM4ZmMwYjdmYWU1NTk4MzIuLjk3NDEzMzU3ZWVmZjE1MmM3OTI0ZmI0MjkzOWE1Yzk3 MGFkOGQ2ZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkgQEAKKzIwMjEtMTAtMDcgIE15bGVzIEMu IE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbR1BVIFByb2Nlc3Nd IFVuaXF1ZSBSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXJzIFBhcnQgMjogVW5yb2xsIFBlbmRp bmdXYWtldXBJbmZvcm1hdGlvbjo6YXJndW1lbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzE0MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZSdyZSBpbiB0aGUgcHJvY2VzcyBvZiByZXBsYWNpbmcg UmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVycyBpbiB0aGUgR1BVIHByb2Nlc3Mgd2l0aAorICAg ICAgICBRdWFsaWZpZWRSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIuIFVuZm9ydHVuYXRlbHks IFBlbmRpbmdXYWtldXBJbmZvcm1hdGlvbiBob2xkcworICAgICAgICBhIEdQVVByb2Nlc3NXYWtl dXBNZXNzYWdlQXJndW1lbnRzIHdoaWNoIGl0c2VsZiBob2xkcyBhIFJlbmRlcmluZ1Jlc291cmNl SWRlbnRpZmllcnMuCisgICAgICAgIFBlbmRpbmdXYWtldXBJbmZvcm1hdGlvbiBpcyBwYXJ0IG9m IHRoZSBHUFUgcHJvY2Vzcywgc28gaXQgbmVlZHMgdG8gbWlncmF0ZSB0byAKKyAgICAgICAgUXVh bGlmaWVkUmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyLCBidXQgR1BVUHJvY2Vzc1dha2V1cE1l c3NhZ2VBcmd1bWVudHMgaXMgdGhlIHR5cGUKKyAgICAgICAgb2YgdGhlIGFyZ3VtZW50cyB0byB0 aGUgV2FrZVVwQW5kQXBwbHlEaXNwbGF5TGlzdCBtZXNzYWdlLCBzbyBpdCBjYW4ndCBob2xkIGEK KyAgICAgICAgUXVhbGlmaWVkUmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyLgorCisgICAgICAg IFNvLCB0aGUgc29sdXRpb24gaXMgdG8gdW5yb2xsIFBlbmRpbmdXYWtldXBJbmZvcm1hdGlvbjo6 YXJndW1lbnRzLCBhbmQgaG9pc3QgaXRzIGZpZWxkcworICAgICAgICBkaXJlY3RseSBpbnRvIHRo ZSBQZW5kaW5nV2FrZXVwSW5mb3JtYXRpb24uIFRoYXQgd2F5LCBQZW5kaW5nV2FrZXVwSW5mb3Jt YXRpb24gY2FuIGJlCisgICAgICAgIHVwZGF0ZWQgdG8gdXNlIFF1YWxpZmllZFJlbmRlcmluZ1Jl c291cmNlSWRlbnRpZmllciwgd2l0aG91dCBhZmZlY3RpbmcKKyAgICAgICAgdGhlIFdha2VVcEFu ZEFwcGx5RGlzcGxheUxpc3QgbWVzc2FnZS4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVz ZSB0aGVyZSBpcyBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBHUFVQcm9jZXNzL2dy YXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmQuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZW1v dGVSZW5kZXJpbmdCYWNrZW5kOjpjcmVhdGVJbWFnZUJ1ZmZlcldpdGhRdWFsaWZpZWRJZGVudGlm aWVyKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6bmV4dERlc3Rp bmF0aW9uSW1hZ2VCdWZmZXJBZnRlckFwcGx5aW5nRGlzcGxheUxpc3RzKToKKyAgICAgICAgKFdl YktpdDo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6d2FrZVVwQW5kQXBwbHlEaXNwbGF5TGlzdCk6 CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OnNldE5leHRJdGVtQnVm ZmVyVG9SZWFkKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6Y2Fj aGVOYXRpdmVJbWFnZVdpdGhRdWFsaWZpZWRJZGVudGlmaWVyKToKKyAgICAgICAgKFdlYktpdDo6 UmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6Y2FjaGVGb250V2l0aFF1YWxpZmllZElkZW50aWZpZXIp OgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpmaW5hbGl6ZVJlbmRl cmluZ1VwZGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OmRp ZENyZWF0ZVNoYXJlZERpc3BsYXlMaXN0SGFuZGxlV2l0aFF1YWxpZmllZElkZW50aWZpZXIpOgor ICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpyZXN1bWVGcm9tUGVuZGlu Z1dha2V1cEluZm9ybWF0aW9uKToKKyAgICAgICAgKiBHUFVQcm9jZXNzL2dyYXBoaWNzL1JlbW90 ZVJlbmRlcmluZ0JhY2tlbmQuaDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVuZGVyaW5nQmFj a2VuZDo6UGVuZGluZ1dha2V1cEluZm9ybWF0aW9uOjphcmd1bWVudHMgY29uc3QpOgorICAgICAg ICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpQZW5kaW5nV2FrZXVwSW5mb3JtYXRp b246OnNob3VsZFBlcmZvcm1XYWtldXAgY29uc3QpOgorCiAyMDIxLTEwLTA3ICBNeWxlcyBDLiBN YXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgW0dQVSBQcm9jZXNzXSBV bmlxdWUgUmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVycyBQYXJ0IDE6IFVuaXF1aWZ5IGF0IGVu dHJ5IHBvaW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL2dyYXBoaWNz L1JlbW90ZVJlbmRlcmluZ0JhY2tlbmQuY3BwIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL2dy YXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmQuY3BwCmluZGV4IDEyNDU1Yjc2ZWQxNmQxNzBj M2Y1YTZmZDdmOTA2MDZmYzUwZTU4YjguLmI3ZjBmZjg2ZTZmOGUxNGZmZjhiNTI4YjkxOTkwNTFl OGE5ZTQwZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9ncmFwaGljcy9S ZW1vdGVSZW5kZXJpbmdCYWNrZW5kLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3Mv Z3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZC5jcHAKQEAgLTE4OSw3ICsxODksNyBAQCB2 b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OmNyZWF0ZUltYWdlQnVmZmVyV2l0aFF1YWxpZmll ZElkZW50aWZpZXIoY29uc3QgRmxvYQogICAgIHVwZGF0ZVJlbmRlcmluZ1Jlc291cmNlUmVxdWVz dCgpOwogCiAgICAgaWYgKG1fcGVuZGluZ1dha2V1cEluZm8gJiYgbV9wZW5kaW5nV2FrZXVwSW5m by0+c2hvdWxkUGVyZm9ybVdha2V1cChpbWFnZUJ1ZmZlclJlc291cmNlSWRlbnRpZmllci5vYmpl Y3QoKSkpCi0gICAgICAgIHdha2VVcEFuZEFwcGx5RGlzcGxheUxpc3Qoc3RkOjpleGNoYW5nZSht X3BlbmRpbmdXYWtldXBJbmZvLCBzdGQ6Om51bGxvcHQpLT5hcmd1bWVudHMpOworICAgICAgICBy ZXN1bWVGcm9tUGVuZGluZ1dha2V1cEluZm9ybWF0aW9uKCk7CiB9CiAKIFJlbW90ZVJlbmRlcmlu Z0JhY2tlbmQ6OlJlcGxheWVyRGVsZWdhdGU6OlJlcGxheWVyRGVsZWdhdGUoV2ViQ29yZTo6SW1h Z2VCdWZmZXImIGRlc3RpbmF0aW9uLCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kJiByZW1vdGVSZW5k ZXJpbmdCYWNrZW5kKQpAQCAtMjgxLDcgKzI4MSwxMCBAQCBSZWZQdHI8SW1hZ2VCdWZmZXI+IFJl bW90ZVJlbmRlcmluZ0JhY2tlbmQ6Om5leHREZXN0aW5hdGlvbkltYWdlQnVmZmVyQWZ0ZXJBcHBs eQogICAgICAgICAgICAgaWYgKCFkZXN0aW5hdGlvbikgewogICAgICAgICAgICAgICAgIEFTU0VS VCghbV9wZW5kaW5nV2FrZXVwSW5mbyk7CiAgICAgICAgICAgICAgICAgbV9wZW5kaW5nV2FrZXVw SW5mbyA9IHt7Ci0gICAgICAgICAgICAgICAgICAgIHsgaGFuZGxlLmlkZW50aWZpZXIoKSwgb2Zm c2V0LCAqcmVzdWx0Lm5leHREZXN0aW5hdGlvbkltYWdlQnVmZmVyLCByZWFzb24gfSwKKyAgICAg ICAgICAgICAgICAgICAgaGFuZGxlLmlkZW50aWZpZXIoKSwKKyAgICAgICAgICAgICAgICAgICAg b2Zmc2V0LAorICAgICAgICAgICAgICAgICAgICAqcmVzdWx0Lm5leHREZXN0aW5hdGlvbkltYWdl QnVmZmVyLAorICAgICAgICAgICAgICAgICAgICByZWFzb24sCiAgICAgICAgICAgICAgICAgICAg IHN0ZDo6bnVsbG9wdCwKICAgICAgICAgICAgICAgICAgICAgUmVtb3RlUmVuZGVyaW5nQmFja2Vu ZFN0YXRlOjpXYWl0aW5nRm9yRGVzdGluYXRpb25JbWFnZUJ1ZmZlcgogICAgICAgICAgICAgICAg IH19OwpAQCAtMjkwLDcgKzI5MywxMCBAQCBSZWZQdHI8SW1hZ2VCdWZmZXI+IFJlbW90ZVJlbmRl cmluZ0JhY2tlbmQ6Om5leHREZXN0aW5hdGlvbkltYWdlQnVmZmVyQWZ0ZXJBcHBseQogCiAgICAg ICAgIGlmIChyZXN1bHQucmVhc29uRm9yU3RvcHBpbmcgPT0gRGlzcGxheUxpc3Q6OlN0b3BSZXBs YXlSZWFzb246Ok1pc3NpbmdDYWNoZWRSZXNvdXJjZSkgewogICAgICAgICAgICAgbV9wZW5kaW5n V2FrZXVwSW5mbyA9IHt7Ci0gICAgICAgICAgICAgICAgeyBoYW5kbGUuaWRlbnRpZmllcigpLCBv ZmZzZXQsIGRlc3RpbmF0aW9uLT5yZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIoKSwgcmVhc29u IH0sCisgICAgICAgICAgICAgICAgaGFuZGxlLmlkZW50aWZpZXIoKSwKKyAgICAgICAgICAgICAg ICBvZmZzZXQsCisgICAgICAgICAgICAgICAgZGVzdGluYXRpb24tPnJlbmRlcmluZ1Jlc291cmNl SWRlbnRpZmllcigpLAorICAgICAgICAgICAgICAgIHJlYXNvbiwKICAgICAgICAgICAgICAgICBy ZXN1bHQubWlzc2luZ0NhY2hlZFJlc291cmNlSWRlbnRpZmllciwKICAgICAgICAgICAgICAgICBS ZW1vdGVSZW5kZXJpbmdCYWNrZW5kU3RhdGU6OldhaXRpbmdGb3JDYWNoZWRSZXNvdXJjZQogICAg ICAgICAgICAgfX07CkBAIC0zNDYsMTIgKzM1MiwxMiBAQCB2b2lkIFJlbW90ZVJlbmRlcmluZ0Jh Y2tlbmQ6Ondha2VVcEFuZEFwcGx5RGlzcGxheUxpc3QoY29uc3QgR1BVUHJvY2Vzc1dha2V1cE1l cwogICAgIExPR19XSVRIX1NUUkVBTShTaGFyZWREaXNwbGF5TGlzdHMsIHN0cmVhbSA8PCAiV2Fr aW5nIHVwIHRvIEl0ZW1zWyIgPDwgYXJndW1lbnRzLml0ZW1CdWZmZXJJZGVudGlmaWVyIDw8ICJd ID0+IEltYWdlKCIgPDwgYXJndW1lbnRzLmRlc3RpbmF0aW9uSW1hZ2VCdWZmZXJJZGVudGlmaWVy IDw8ICIpIGF0ICIgPDwgYXJndW1lbnRzLm9mZnNldCk7CiAgICAgZGVzdGluYXRpb25JbWFnZUJ1 ZmZlciA9IG5leHREZXN0aW5hdGlvbkltYWdlQnVmZmVyQWZ0ZXJBcHBseWluZ0Rpc3BsYXlMaXN0 cygqZGVzdGluYXRpb25JbWFnZUJ1ZmZlciwgYXJndW1lbnRzLm9mZnNldCwgKmluaXRpYWxIYW5k bGUsIGFyZ3VtZW50cy5yZWFzb24pOwogCi0gICAgLy8gRklYTUU6IEFsbCB0aGUgY2FsbGVycyBw YXNzIG1fcGVuZGluZ1dha2V1cEluZm8uYXJndW1lbnRzIHNvIHRoZSBib2R5IG9mIHRoaXMgZnVu Y3Rpb24gc2hvdWxkIGp1c3QgYmUgdGhpcyBsb29wLgorICAgIC8vIEZJWE1FOiBBbGwgdGhlIGNh bGxlcnMgcGFzcyBtX3BlbmRpbmdXYWtldXBJbmZvJ3MgZmllbGRzIHNvIHRoZSBib2R5IG9mIHRo aXMgZnVuY3Rpb24gc2hvdWxkIGp1c3QgYmUgdGhpcyBsb29wLgogICAgIHdoaWxlIChkZXN0aW5h dGlvbkltYWdlQnVmZmVyICYmIG1fcGVuZGluZ1dha2V1cEluZm8pIHsKICAgICAgICAgaWYgKG1f cGVuZGluZ1dha2V1cEluZm8tPm1pc3NpbmdDYWNoZWRSZXNvdXJjZUlkZW50aWZpZXIpCiAgICAg ICAgICAgICBicmVhazsKIAotICAgICAgICBhdXRvIG5leHRIYW5kbGUgPSBtX3NoYXJlZERpc3Bs YXlMaXN0SGFuZGxlcy5nZXQobV9wZW5kaW5nV2FrZXVwSW5mby0+YXJndW1lbnRzLml0ZW1CdWZm ZXJJZGVudGlmaWVyKTsKKyAgICAgICAgYXV0byBuZXh0SGFuZGxlID0gbV9zaGFyZWREaXNwbGF5 TGlzdEhhbmRsZXMuZ2V0KG1fcGVuZGluZ1dha2V1cEluZm8tPml0ZW1CdWZmZXJJZGVudGlmaWVy KTsKICAgICAgICAgaWYgKCFuZXh0SGFuZGxlKSB7CiAgICAgICAgICAgICAvLyBJZiB0aGUgaGFu ZGxlIGlkZW50aWZpZXIgaXMgY3VycmVudGx5IHVua25vd24sIHdhaXQgdW50aWwgdGhlIEdQVSBw cm9jZXNzIHJlY2VpdmVzIGFuCiAgICAgICAgICAgICAvLyBJUEMgbWVzc2FnZSB3aXRoIGEgc2hh cmVkIG1lbW9yeSBoYW5kbGUgdG8gdGhlIG5leHQgaXRlbSBidWZmZXIuCkBAIC0zNTksOCArMzY1 LDEwIEBAIHZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6d2FrZVVwQW5kQXBwbHlEaXNwbGF5 TGlzdChjb25zdCBHUFVQcm9jZXNzV2FrZXVwTWVzCiAgICAgICAgIH0KIAogICAgICAgICAvLyBP dGhlcndpc2UsIGNvbnRpbnVlIHJlYWRpbmcgdGhlIG5leHQgZGlzcGxheSBsaXN0IGl0ZW0gYnVm ZmVyIGZyb20gdGhlIHN0YXJ0LgotICAgICAgICBhdXRvIGFyZ3VtZW50cyA9IHN0ZDo6ZXhjaGFu Z2UobV9wZW5kaW5nV2FrZXVwSW5mbywgc3RkOjpudWxsb3B0KS0+YXJndW1lbnRzOwotICAgICAg ICBkZXN0aW5hdGlvbkltYWdlQnVmZmVyID0gbmV4dERlc3RpbmF0aW9uSW1hZ2VCdWZmZXJBZnRl ckFwcGx5aW5nRGlzcGxheUxpc3RzKCpkZXN0aW5hdGlvbkltYWdlQnVmZmVyLCBhcmd1bWVudHMu b2Zmc2V0LCAqbmV4dEhhbmRsZSwgYXJndW1lbnRzLnJlYXNvbik7CisgICAgICAgIGF1dG8gb2Zm c2V0ID0gbV9wZW5kaW5nV2FrZXVwSW5mby0+b2Zmc2V0OworICAgICAgICBhdXRvIHJlYXNvbiA9 IG1fcGVuZGluZ1dha2V1cEluZm8tPnJlYXNvbjsKKyAgICAgICAgbV9wZW5kaW5nV2FrZXVwSW5m byA9IHN0ZDo6bnVsbG9wdDsKKyAgICAgICAgZGVzdGluYXRpb25JbWFnZUJ1ZmZlciA9IG5leHRE ZXN0aW5hdGlvbkltYWdlQnVmZmVyQWZ0ZXJBcHBseWluZ0Rpc3BsYXlMaXN0cygqZGVzdGluYXRp b25JbWFnZUJ1ZmZlciwgb2Zmc2V0LCAqbmV4dEhhbmRsZSwgcmVhc29uKTsKICAgICB9CiAgICAg TE9HX1dJVEhfU1RSRUFNKFNoYXJlZERpc3BsYXlMaXN0cywgc3RyZWFtIDw8ICJHb2luZyBiYWNr IHRvIHNsZWVwLiIpOwogCkBAIC0zNzMsNyArMzgxLDEwIEBAIHZvaWQgUmVtb3RlUmVuZGVyaW5n QmFja2VuZDo6d2FrZVVwQW5kQXBwbHlEaXNwbGF5TGlzdChjb25zdCBHUFVQcm9jZXNzV2FrZXVw TWVzCiB2b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OnNldE5leHRJdGVtQnVmZmVyVG9SZWFk KERpc3BsYXlMaXN0OjpJdGVtQnVmZmVySWRlbnRpZmllciBpZGVudGlmaWVyLCBXZWJDb3JlOjpS ZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIgZGVzdGluYXRpb25JZGVudGlmaWVyKQogewogICAg IG1fcGVuZGluZ1dha2V1cEluZm8gPSB7ewotICAgICAgICB7IGlkZW50aWZpZXIsIFNoYXJlZERp c3BsYXlMaXN0SGFuZGxlOjpoZWFkZXJTaXplKCksIGRlc3RpbmF0aW9uSWRlbnRpZmllciwgR1BV UHJvY2Vzc1dha2V1cFJlYXNvbjo6VW5zcGVjaWZpZWQgfSwKKyAgICAgICAgaWRlbnRpZmllciwK KyAgICAgICAgU2hhcmVkRGlzcGxheUxpc3RIYW5kbGU6OmhlYWRlclNpemUoKSwKKyAgICAgICAg ZGVzdGluYXRpb25JZGVudGlmaWVyLAorICAgICAgICBHUFVQcm9jZXNzV2FrZXVwUmVhc29uOjpV bnNwZWNpZmllZCwKICAgICAgICAgc3RkOjpudWxsb3B0LAogICAgICAgICBSZW1vdGVSZW5kZXJp bmdCYWNrZW5kU3RhdGU6OldhaXRpbmdGb3JJdGVtQnVmZmVyCiAgICAgfX07CkBAIC01MjksNyAr NTQwLDcgQEAgdm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpjYWNoZU5hdGl2ZUltYWdlV2l0 aFF1YWxpZmllZElkZW50aWZpZXIoY29uc3QgU2hhcmUKICAgICBtX3JlbW90ZVJlc291cmNlQ2Fj aGUuY2FjaGVOYXRpdmVJbWFnZSgqaW1hZ2UpOwogCiAgICAgaWYgKG1fcGVuZGluZ1dha2V1cElu Zm8gJiYgbV9wZW5kaW5nV2FrZXVwSW5mby0+c2hvdWxkUGVyZm9ybVdha2V1cChuYXRpdmVJbWFn ZVJlc291cmNlSWRlbnRpZmllci5vYmplY3QoKSkpCi0gICAgICAgIHdha2VVcEFuZEFwcGx5RGlz cGxheUxpc3Qoc3RkOjpleGNoYW5nZShtX3BlbmRpbmdXYWtldXBJbmZvLCBzdGQ6Om51bGxvcHQp LT5hcmd1bWVudHMpOworICAgICAgICByZXN1bWVGcm9tUGVuZGluZ1dha2V1cEluZm9ybWF0aW9u KCk7CiB9CiAKIHZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6Y2FjaGVGb250KFJlZjxXZWJD b3JlOjpGb250PiYmIGZvbnQpCkBAIC01NDYsNyArNTU3LDcgQEAgdm9pZCBSZW1vdGVSZW5kZXJp bmdCYWNrZW5kOjpjYWNoZUZvbnRXaXRoUXVhbGlmaWVkSWRlbnRpZmllcihSZWY8Rm9udD4mJiBm b250LAogCiAgICAgbV9yZW1vdGVSZXNvdXJjZUNhY2hlLmNhY2hlRm9udChXVEZNb3ZlKGZvbnQp KTsKICAgICBpZiAobV9wZW5kaW5nV2FrZXVwSW5mbyAmJiBtX3BlbmRpbmdXYWtldXBJbmZvLT5z aG91bGRQZXJmb3JtV2FrZXVwKGZvbnRSZXNvdXJjZUlkZW50aWZpZXIub2JqZWN0KCkpKQotICAg ICAgICB3YWtlVXBBbmRBcHBseURpc3BsYXlMaXN0KHN0ZDo6ZXhjaGFuZ2UobV9wZW5kaW5nV2Fr ZXVwSW5mbywgc3RkOjpudWxsb3B0KS0+YXJndW1lbnRzKTsKKyAgICAgICAgcmVzdW1lRnJvbVBl bmRpbmdXYWtldXBJbmZvcm1hdGlvbigpOwogfQogCiB2b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tl bmQ6OmRlbGV0ZUFsbEZvbnRzKCkKQEAgLTU3MiwxMiArNTgzLDEyIEBAIHZvaWQgUmVtb3RlUmVu ZGVyaW5nQmFja2VuZDo6cmVsZWFzZVJlbW90ZVJlc291cmNlV2l0aFF1YWxpZmllZElkZW50aWZp ZXIoUXVhbGlmCiAKIHZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6ZmluYWxpemVSZW5kZXJp bmdVcGRhdGUoUmVuZGVyaW5nVXBkYXRlSUQgcmVuZGVyaW5nVXBkYXRlSUQpCiB7Ci0gICAgYXV0 byBzaG91bGRQZXJmb3JtV2FrZXVwID0gWyZdKGNvbnN0IEdQVVByb2Nlc3NXYWtldXBNZXNzYWdl QXJndW1lbnRzJiBhcmd1bWVudHMpIHsKLSAgICAgICAgcmV0dXJuIG1fcmVtb3RlUmVzb3VyY2VD YWNoZS5jYWNoZWRJbWFnZUJ1ZmZlcihhcmd1bWVudHMuZGVzdGluYXRpb25JbWFnZUJ1ZmZlcklk ZW50aWZpZXIpICYmIG1fc2hhcmVkRGlzcGxheUxpc3RIYW5kbGVzLmNvbnRhaW5zKGFyZ3VtZW50 cy5pdGVtQnVmZmVySWRlbnRpZmllcik7CisgICAgYXV0byBzaG91bGRQZXJmb3JtV2FrZXVwID0g WyZdIHsKKyAgICAgICAgcmV0dXJuIG1fcmVtb3RlUmVzb3VyY2VDYWNoZS5jYWNoZWRJbWFnZUJ1 ZmZlcihtX3BlbmRpbmdXYWtldXBJbmZvLT5kZXN0aW5hdGlvbkltYWdlQnVmZmVySWRlbnRpZmll cikgJiYgbV9zaGFyZWREaXNwbGF5TGlzdEhhbmRsZXMuY29udGFpbnMobV9wZW5kaW5nV2FrZXVw SW5mby0+aXRlbUJ1ZmZlcklkZW50aWZpZXIpOwogICAgIH07CiAKLSAgICBpZiAobV9wZW5kaW5n V2FrZXVwSW5mbyAmJiBzaG91bGRQZXJmb3JtV2FrZXVwKG1fcGVuZGluZ1dha2V1cEluZm8tPmFy Z3VtZW50cykpCi0gICAgICAgIHdha2VVcEFuZEFwcGx5RGlzcGxheUxpc3Qoc3RkOjpleGNoYW5n ZShtX3BlbmRpbmdXYWtldXBJbmZvLCBzdGQ6Om51bGxvcHQpLT5hcmd1bWVudHMpOworICAgIGlm IChtX3BlbmRpbmdXYWtldXBJbmZvICYmIHNob3VsZFBlcmZvcm1XYWtldXAoKSkKKyAgICAgICAg cmVzdW1lRnJvbVBlbmRpbmdXYWtldXBJbmZvcm1hdGlvbigpOwogCiAgICAgc2VuZChNZXNzYWdl czo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OjpEaWRGaW5hbGl6ZVJlbmRlcmluZ1VwZGF0 ZShyZW5kZXJpbmdVcGRhdGVJRCksIG1fcmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIpOwogfQpA QCAtNjAxLDcgKzYxMiwxNCBAQCB2b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OmRpZENyZWF0 ZVNoYXJlZERpc3BsYXlMaXN0SGFuZGxlV2l0aFF1YWxpZmllZElkZW50aQogICAgIH0KIAogICAg IGlmIChtX3BlbmRpbmdXYWtldXBJbmZvICYmIG1fcGVuZGluZ1dha2V1cEluZm8tPnNob3VsZFBl cmZvcm1XYWtldXAoaXRlbUJ1ZmZlcklkZW50aWZpZXIpKQotICAgICAgICB3YWtlVXBBbmRBcHBs eURpc3BsYXlMaXN0KHN0ZDo6ZXhjaGFuZ2UobV9wZW5kaW5nV2FrZXVwSW5mbywgc3RkOjpudWxs b3B0KS0+YXJndW1lbnRzKTsKKyAgICAgICAgcmVzdW1lRnJvbVBlbmRpbmdXYWtldXBJbmZvcm1h dGlvbigpOworfQorCit2b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OnJlc3VtZUZyb21QZW5k aW5nV2FrZXVwSW5mb3JtYXRpb24oKQoreworICAgIGF1dG8gYXJndW1lbnRzID0gbV9wZW5kaW5n V2FrZXVwSW5mby0+YXJndW1lbnRzKCk7CisgICAgbV9wZW5kaW5nV2FrZXVwSW5mbyA9IHN0ZDo6 bnVsbG9wdDsKKyAgICB3YWtlVXBBbmRBcHBseURpc3BsYXlMaXN0KGFyZ3VtZW50cyk7CiB9CiAK IHZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6ZGlkQ3JlYXRlTWFza0ltYWdlQnVmZmVyKElt YWdlQnVmZmVyJiBpbWFnZUJ1ZmZlcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvR1BVUHJv Y2Vzcy9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kLmggYi9Tb3VyY2UvV2ViS2l0L0dQ VVByb2Nlc3MvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZC5oCmluZGV4IGNhMDgxMTYw YjY1NDRiNGJhMzUxM2FlZWIwNGMwYjQ1YmUzZDEzMGQuLjc0NGM5NDE0ZTUyNDk5MWI4MGVlZTVm NjIwNzlmMmFiNTNhNmMxMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9n cmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kLmgKKysrIGIvU291cmNlL1dlYktpdC9HUFVQ cm9jZXNzL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmQuaApAQCAtMTYwLDYgKzE2MCw4 IEBAIHByaXZhdGU6CiAgICAgdm9pZCByZWxlYXNlUmVtb3RlUmVzb3VyY2VXaXRoUXVhbGlmaWVk SWRlbnRpZmllcihRdWFsaWZpZWRSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIsIHVpbnQ2NF90 IHVzZUNvdW50KTsKICAgICB2b2lkIGNhY2hlRm9udFdpdGhRdWFsaWZpZWRJZGVudGlmaWVyKFJl ZjxXZWJDb3JlOjpGb250PiYmLCBRdWFsaWZpZWRSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIp OwogCisgICAgdm9pZCByZXN1bWVGcm9tUGVuZGluZ1dha2V1cEluZm9ybWF0aW9uKCk7CisKICAg ICBjbGFzcyBSZXBsYXllckRlbGVnYXRlIDogcHVibGljIFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpS ZXBsYXllcjo6RGVsZWdhdGUgewogICAgIHB1YmxpYzoKICAgICAgICAgUmVwbGF5ZXJEZWxlZ2F0 ZShXZWJDb3JlOjpJbWFnZUJ1ZmZlciYsIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQmKTsKQEAgLTE3 NSwxOSArMTc3LDI3IEBAIHByaXZhdGU6CiAgICAgfTsKIAogICAgIHN0cnVjdCBQZW5kaW5nV2Fr ZXVwSW5mb3JtYXRpb24gewotICAgICAgICBHUFVQcm9jZXNzV2FrZXVwTWVzc2FnZUFyZ3VtZW50 cyBhcmd1bWVudHM7CisgICAgICAgIFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpJdGVtQnVmZmVySWRl bnRpZmllciBpdGVtQnVmZmVySWRlbnRpZmllcjsKKyAgICAgICAgdWludDY0X3Qgb2Zmc2V0IHsg MCB9OworICAgICAgICBXZWJDb3JlOjpSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIgZGVzdGlu YXRpb25JbWFnZUJ1ZmZlcklkZW50aWZpZXI7CisgICAgICAgIEdQVVByb2Nlc3NXYWtldXBSZWFz b24gcmVhc29uIHsgR1BVUHJvY2Vzc1dha2V1cFJlYXNvbjo6VW5zcGVjaWZpZWQgfTsKICAgICAg ICAgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXI+IG1p c3NpbmdDYWNoZWRSZXNvdXJjZUlkZW50aWZpZXI7CiAgICAgICAgIFJlbW90ZVJlbmRlcmluZ0Jh Y2tlbmRTdGF0ZSBzdGF0ZSB7IFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRTdGF0ZTo6SW5pdGlhbGl6 ZWQgfTsKIAorICAgICAgICBHUFVQcm9jZXNzV2FrZXVwTWVzc2FnZUFyZ3VtZW50cyBhcmd1bWVu dHMoKSBjb25zdAorICAgICAgICB7CisgICAgICAgICAgICByZXR1cm4geyBpdGVtQnVmZmVySWRl bnRpZmllciwgb2Zmc2V0LCBkZXN0aW5hdGlvbkltYWdlQnVmZmVySWRlbnRpZmllciwgcmVhc29u IH07CisgICAgICAgIH0KKwogICAgICAgICBib29sIHNob3VsZFBlcmZvcm1XYWtldXAoV2ViQ29y ZTo6UmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyIGlkZW50aWZpZXIpIGNvbnN0CiAgICAgICAg IHsKLSAgICAgICAgICAgIHJldHVybiBhcmd1bWVudHMuZGVzdGluYXRpb25JbWFnZUJ1ZmZlcklk ZW50aWZpZXIgPT0gaWRlbnRpZmllcgorICAgICAgICAgICAgcmV0dXJuIGRlc3RpbmF0aW9uSW1h Z2VCdWZmZXJJZGVudGlmaWVyID09IGlkZW50aWZpZXIKICAgICAgICAgICAgICAgICB8fCBtaXNz aW5nQ2FjaGVkUmVzb3VyY2VJZGVudGlmaWVyID09IGlkZW50aWZpZXI7CiAgICAgICAgIH0KIAog ICAgICAgICBib29sIHNob3VsZFBlcmZvcm1XYWtldXAoV2ViQ29yZTo6RGlzcGxheUxpc3Q6Okl0 ZW1CdWZmZXJJZGVudGlmaWVyIGlkZW50aWZpZXIpIGNvbnN0CiAgICAgICAgIHsKLSAgICAgICAg ICAgIHJldHVybiBhcmd1bWVudHMuaXRlbUJ1ZmZlcklkZW50aWZpZXIgPT0gaWRlbnRpZmllcjsK KyAgICAgICAgICAgIHJldHVybiBpdGVtQnVmZmVySWRlbnRpZmllciA9PSBpZGVudGlmaWVyOwog ICAgICAgICB9CiAgICAgfTsKIAo=