243752 2022-08-09 15:34:04 -0700 [Painting] Introduce TextDecorationPainter::BackgroundDecorationGeometry 2022-08-14 14:06:25 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 243766 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1890123 0 zalan 2022-08-09 15:34:04 -0700 ssia 1890126 1 461509 zalan 2022-08-09 15:39:22 -0700 Created attachment 461509 Patch 1890331 2 ews-feeder 2022-08-10 10:30:13 -0700 Committed 253301@main (3197e7a821f6): <https://commits.webkit.org/253301@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 461509. 1890332 3 webkit-bug-importer 2022-08-10 10:31:17 -0700 <rdar://problem/98458659> 461509 2022-08-09 15:39:22 -0700 2022-08-10 10:30:14 -0700 Patch bug-243752-20220809153921.patch text/plain 14561 zalan RnJvbSAxNGQwODJiOTEzZGRhYTc1OWM2N2M5Nzk1ZGI2MDFjYjM2ZGNhN2VlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBU dWUsIDkgQXVnIDIwMjIgMTU6MzQ6MTUgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbUGFpbnRpbmdd IEludHJvZHVjZQogVGV4dERlY29yYXRpb25QYWludGVyOjpCYWNrZ3JvdW5kRGVjb3JhdGlvbkdl b21ldHJ5CiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQzNzUyCgpS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCkxldCdzIHB1dCBhbGwgdGhlIGJhY2tncm91bmQg Z2VvbWV0cnkgaW5mb3JtYXRpb24gaW4gdG8gc3RydWN0IChCYWNrZ3JvdW5kRGVjb3JhdGlvbkdl b21ldHJ5KS4KCiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRCb3hQYWludGVyLmNwcDoK KFdlYkNvcmU6OlRleHRCb3hQYWludGVyPFRleHRCb3hQYXRoPjo6cGFpbnRCYWNrZ3JvdW5kRGVj b3JhdGlvbnMpOgoqIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0RGVjb3JhdGlvblBhaW50 ZXIuY3BwOgooV2ViQ29yZTo6VGV4dERlY29yYXRpb25QYWludGVyOjpwYWludEJhY2tncm91bmRE ZWNvcmF0aW9ucyk6CiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHREZWNvcmF0aW9uUGFp bnRlci5oOgooV2ViQ29yZTo6VGV4dERlY29yYXRpb25QYWludGVyOjpvdmVycmlkZVN0eWxlcyBj b25zdCk6Ci0tLQogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRCb3hQYWludGVyLmNwcCAg IHwgMzggKysrKysrKystLS0KIC4uLi9yZW5kZXJpbmcvVGV4dERlY29yYXRpb25QYWludGVyLmNw cCAgICAgICB8IDY2ICsrKysrKysrKy0tLS0tLS0tLS0KIC4uLi9XZWJDb3JlL3JlbmRlcmluZy9U ZXh0RGVjb3JhdGlvblBhaW50ZXIuaCB8IDExICsrKy0KIDMgZmlsZXMgY2hhbmdlZCwgNzMgaW5z ZXJ0aW9ucygrKSwgNDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1RleHRCb3hQYWludGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9U ZXh0Qm94UGFpbnRlci5jcHAKaW5kZXggZWRkODU5ZmI2NWQyLi5jMGZhYmZlODdkYWMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0Qm94UGFpbnRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRCb3hQYWludGVyLmNwcApAQCAtNDQ4LDE2ICs0 NDgsMzggQEAgdm9pZCBUZXh0Qm94UGFpbnRlcjxUZXh0Qm94UGF0aD46OnBhaW50QmFja2dyb3Vu ZERlY29yYXRpb25zKFRleHREZWNvcmF0aW9uUGFpbnQKICAgICAgICAgbV9wYWludEluZm8uY29u dGV4dCgpLmNvbmNhdENUTShyb3RhdGlvbihtX3BhaW50UmVjdCwgQ2xvY2t3aXNlKSk7CiAKICAg ICBhdXRvIHRleHRSdW4gPSBtX3BhaW50VGV4dFJ1bi5zdWJSdW4obWFya2VkVGV4dC5zdGFydE9m ZnNldCwgbWFya2VkVGV4dC5lbmRPZmZzZXQgLSBtYXJrZWRUZXh0LnN0YXJ0T2Zmc2V0KTsKLSAg ICBhdXRvIHRleHRPcmlnaW4gPSB0ZXh0T3JpZ2luRnJvbVBhaW50UmVjdChzbmFwcGVkU2VsZWN0 aW9uUmVjdCk7Ci0gICAgYXV0byBib3hPcmlnaW4gPSBzbmFwcGVkU2VsZWN0aW9uUmVjdC5sb2Nh dGlvbigpOwotICAgIGF1dG8gYm94V2lkdGggPSBzbmFwcGVkU2VsZWN0aW9uUmVjdC53aWR0aCgp OwotICAgIGF1dG8gdW5kZXJsaW5lT2Zmc2V0ID0gWyZdIHsKLSAgICAgICAgaWYgKCFkZWNvcmF0 aW9uUGFpbnRlci50ZXh0RGVjb3JhdGlvbnMoKS5jb250YWlucyhUZXh0RGVjb3JhdGlvbkxpbmU6 OlVuZGVybGluZSkpCi0gICAgICAgICAgICByZXR1cm4gMC5mOworICAgIGF1dG8gY29tcHV0ZWRC YWNrZ3JvdW5kRGVjb3JhdGlvbkdlb21ldHJ5ID0gWyZdIHsKKyAgICAgICAgYXV0byBkZXZpY2VT Y2FsZUZhY3RvciA9IG1fcmVuZGVyZXIuZG9jdW1lbnQoKS5kZXZpY2VTY2FsZUZhY3RvcigpOwog ICAgICAgICBhdXRvJiBzdHlsZVRvVXNlID0gbV9pc0ZpcnN0TGluZSA/IG1fcmVuZGVyZXIuZmly c3RMaW5lU3R5bGUoKSA6IG1fcmVuZGVyZXIuc3R5bGUoKTsKLSAgICAgICAgcmV0dXJuIHVuZGVy bGluZU9mZnNldEZvclRleHRCb3hQYWludGluZyhzdHlsZVRvVXNlLCBtYWtlSXRlcmF0b3IoKSk7 CisgICAgICAgIGF1dG8mIGZvbnRNZXRyaWNzID0gc3R5bGVUb1VzZS5tZXRyaWNzT2ZQcmltYXJ5 Rm9udCgpOworICAgICAgICBhdXRvIHRleHREZWNvcmF0aW9ucyA9IGRlY29yYXRpb25QYWludGVy LnRleHREZWNvcmF0aW9ucygpOworICAgICAgICBhdXRvJiBvdmVycmlkZVN0eWxlcyA9IGRlY29y YXRpb25QYWludGVyLm92ZXJyaWRlU3R5bGVzKCk7CisKKyAgICAgICAgYXV0byB0ZXh0RGVjb3Jh dGlvblRoaWNrbmVzcyA9IGNlaWxUb0RldmljZVBpeGVsKHN0eWxlVG9Vc2UudGV4dERlY29yYXRp b25UaGlja25lc3MoKS5yZXNvbHZlKHN0eWxlVG9Vc2UuY29tcHV0ZWRGb250U2l6ZSgpLCBmb250 TWV0cmljcyksIGRldmljZVNjYWxlRmFjdG9yKTsKKyAgICAgICAgYXV0byB1bmRlcmxpbmVPZmZz ZXQgPSBbJl0geworICAgICAgICAgICAgaWYgKCF0ZXh0RGVjb3JhdGlvbnMuY29udGFpbnMoVGV4 dERlY29yYXRpb25MaW5lOjpVbmRlcmxpbmUpKQorICAgICAgICAgICAgICAgIHJldHVybiAwLmY7 CisgICAgICAgICAgICBhdXRvIGJhc2VPZmZzZXQgPSB1bmRlcmxpbmVPZmZzZXRGb3JUZXh0Qm94 UGFpbnRpbmcoc3R5bGVUb1VzZSwgbWFrZUl0ZXJhdG9yKCkpOworICAgICAgICAgICAgYXV0byB3 YXZ5T2Zmc2V0ID0gb3ZlcnJpZGVTdHlsZXMudW5kZXJsaW5lLmRlY29yYXRpb25TdHlsZSA9PSBU ZXh0RGVjb3JhdGlvblN0eWxlOjpXYXZ5ID8gd2F2eU9mZnNldEZyb21EZWNvcmF0aW9uKCkgOiAw LmY7CisgICAgICAgICAgICByZXR1cm4gYmFzZU9mZnNldCArIHdhdnlPZmZzZXQ7CisgICAgICAg IH07CisgICAgICAgIGF1dG8gb3ZlcmxpbmVPZmZzZXQgPSBbJl0geworICAgICAgICAgICAgaWYg KCF0ZXh0RGVjb3JhdGlvbnMuY29udGFpbnMoVGV4dERlY29yYXRpb25MaW5lOjpPdmVybGluZSkp CisgICAgICAgICAgICAgICAgcmV0dXJuIDAuZjsKKyAgICAgICAgICAgIGF1dG8gYXV0b1RleHRE ZWNvcmF0aW9uVGhpY2tuZXNzID0gY2VpbFRvRGV2aWNlUGl4ZWwoVGV4dERlY29yYXRpb25UaGlj a25lc3M6OmNyZWF0ZVdpdGhBdXRvKCkucmVzb2x2ZShzdHlsZVRvVXNlLmNvbXB1dGVkRm9udFNp emUoKSwgZm9udE1ldHJpY3MpLCBkZXZpY2VTY2FsZUZhY3Rvcik7CisgICAgICAgICAgICByZXR1 cm4gYXV0b1RleHREZWNvcmF0aW9uVGhpY2tuZXNzIC0gdGV4dERlY29yYXRpb25UaGlja25lc3Mg LSAob3ZlcnJpZGVTdHlsZXMub3ZlcmxpbmUuZGVjb3JhdGlvblN0eWxlID09IFRleHREZWNvcmF0 aW9uU3R5bGU6OldhdnkgPyB3YXZ5T2Zmc2V0RnJvbURlY29yYXRpb24oKSA6IDAuZik7CisgICAg ICAgIH07CisKKyAgICAgICAgcmV0dXJuIFRleHREZWNvcmF0aW9uUGFpbnRlcjo6QmFja2dyb3Vu ZERlY29yYXRpb25HZW9tZXRyeSB7CisgICAgICAgICAgICB0ZXh0T3JpZ2luRnJvbVBhaW50UmVj dChzbmFwcGVkU2VsZWN0aW9uUmVjdCksCisgICAgICAgICAgICBzbmFwcGVkU2VsZWN0aW9uUmVj dC5sb2NhdGlvbigpLAorICAgICAgICAgICAgc25hcHBlZFNlbGVjdGlvblJlY3Qud2lkdGgoKSwK KyAgICAgICAgICAgIHRleHREZWNvcmF0aW9uVGhpY2tuZXNzLAorICAgICAgICAgICAgdW5kZXJs aW5lT2Zmc2V0KCksCisgICAgICAgICAgICBvdmVybGluZU9mZnNldCgpCisgICAgICAgIH07CiAg ICAgfTsKLSAgICBkZWNvcmF0aW9uUGFpbnRlci5wYWludEJhY2tncm91bmREZWNvcmF0aW9ucyh0 ZXh0UnVuLCB0ZXh0T3JpZ2luLCBib3hPcmlnaW4sIGJveFdpZHRoLCB1bmRlcmxpbmVPZmZzZXQo KSwgd2F2eU9mZnNldEZyb21EZWNvcmF0aW9uKCkpOworICAgIGRlY29yYXRpb25QYWludGVyLnBh aW50QmFja2dyb3VuZERlY29yYXRpb25zKHRleHRSdW4sIGNvbXB1dGVkQmFja2dyb3VuZERlY29y YXRpb25HZW9tZXRyeSgpKTsKIAogICAgIGlmIChtX2lzQ29tYmluZWRUZXh0KQogICAgICAgICBt X3BhaW50SW5mby5jb250ZXh0KCkuY29uY2F0Q1RNKHJvdGF0aW9uKG1fcGFpbnRSZWN0LCBDb3Vu dGVyY2xvY2t3aXNlKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4 dERlY29yYXRpb25QYWludGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0RGVj b3JhdGlvblBhaW50ZXIuY3BwCmluZGV4IGQ1NTZiMzkzNDVlZi4uMTU2NGQyNDJhNjk1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dERlY29yYXRpb25QYWludGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dERlY29yYXRpb25QYWludGVyLmNw cApAQCAtMjE5LDEzICsyMTksOSBAQCBUZXh0RGVjb3JhdGlvblBhaW50ZXI6OlRleHREZWNvcmF0 aW9uUGFpbnRlcihHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IFJlbgogfQogCiAvLyBQ YWludCB0ZXh0LXNoYWRvdywgdW5kZXJsaW5lLCBvdmVybGluZQotdm9pZCBUZXh0RGVjb3JhdGlv blBhaW50ZXI6OnBhaW50QmFja2dyb3VuZERlY29yYXRpb25zKGNvbnN0IFRleHRSdW4mIHRleHRS dW4sIGNvbnN0IEZsb2F0UG9pbnQmIHRleHRPcmlnaW4sIGNvbnN0IEZsb2F0UG9pbnQmIGJveE9y aWdpbiwgZmxvYXQgd2lkdGgsIGZsb2F0IHVuZGVybGluZU9mZnNldCwgZmxvYXQgd2F2eU9mZnNl dCkKK3ZvaWQgVGV4dERlY29yYXRpb25QYWludGVyOjpwYWludEJhY2tncm91bmREZWNvcmF0aW9u cyhjb25zdCBUZXh0UnVuJiB0ZXh0UnVuLCBjb25zdCBCYWNrZ3JvdW5kRGVjb3JhdGlvbkdlb21l dHJ5JiBkZWNvcmF0aW9uR2VvbWV0cnkpCiB7Ci0gICAgY29uc3QgYXV0byYgZm9udE1ldHJpY3Mg PSBtX3RleHREZWNvcmF0aW9uU3R5bGUubWV0cmljc09mUHJpbWFyeUZvbnQoKTsKLSAgICBhdXRv IHRleHREZWNvcmF0aW9uVGhpY2tuZXNzID0gY2VpbFRvRGV2aWNlUGl4ZWwobV90ZXh0RGVjb3Jh dGlvblN0eWxlLnRleHREZWNvcmF0aW9uVGhpY2tuZXNzKCkucmVzb2x2ZShtX3RleHREZWNvcmF0 aW9uU3R5bGUuY29tcHV0ZWRGb250U2l6ZSgpLCBmb250TWV0cmljcyksIG1fZGV2aWNlU2NhbGVG YWN0b3IpOwotICAgIEZsb2F0UG9pbnQgbG9jYWxPcmlnaW4gPSBib3hPcmlnaW47Ci0KLSAgICBh dXRvIHBhaW50RGVjb3JhdGlvbiA9IFsmXSAoVGV4dERlY29yYXRpb25MaW5lIGRlY29yYXRpb24s IFRleHREZWNvcmF0aW9uU3R5bGUgc3R5bGUsIGNvbnN0IENvbG9yJiBjb2xvciwgY29uc3QgRmxv YXRSZWN0JiByZWN0KSB7CisgICAgYXV0byBwYWludERlY29yYXRpb24gPSBbJl0gKGF1dG8gZGVj b3JhdGlvbiwgYXV0byBzdHlsZSwgYXV0byYgY29sb3IsIGF1dG8mIHJlY3QpIHsKICAgICAgICAg bV9jb250ZXh0LnNldFN0cm9rZUNvbG9yKGNvbG9yKTsKIAogICAgICAgICBhdXRvIHN0cm9rZVN0 eWxlID0gdGV4dERlY29yYXRpb25TdHlsZVRvU3Ryb2tlU3R5bGUoc3R5bGUpOwpAQCAtMjM1LDgg KzIzMSw4IEBAIHZvaWQgVGV4dERlY29yYXRpb25QYWludGVyOjpwYWludEJhY2tncm91bmREZWNv cmF0aW9ucyhjb25zdCBUZXh0UnVuJiB0ZXh0UnVuLCBjCiAgICAgICAgIGVsc2UgaWYgKGRlY29y YXRpb24gPT0gVGV4dERlY29yYXRpb25MaW5lOjpVbmRlcmxpbmUgfHwgZGVjb3JhdGlvbiA9PSBU ZXh0RGVjb3JhdGlvbkxpbmU6Ok92ZXJsaW5lKSB7CiAgICAgICAgICAgICBpZiAoKG1fdGV4dERl Y29yYXRpb25TdHlsZS50ZXh0RGVjb3JhdGlvblNraXBJbmsoKSA9PSBUZXh0RGVjb3JhdGlvblNr aXBJbms6OkF1dG8gfHwgbV90ZXh0RGVjb3JhdGlvblN0eWxlLnRleHREZWNvcmF0aW9uU2tpcElu aygpID09IFRleHREZWNvcmF0aW9uU2tpcEluazo6QWxsKSAmJiBtX2lzSG9yaXpvbnRhbCkgewog ICAgICAgICAgICAgICAgIGlmICghbV9jb250ZXh0LnBhaW50aW5nRGlzYWJsZWQoKSkgewotICAg ICAgICAgICAgICAgICAgICBGbG9hdFJlY3QgdW5kZXJsaW5lQm91bmRpbmdCb3ggPSBtX2NvbnRl eHQuY29tcHV0ZVVuZGVybGluZUJvdW5kc0ZvclRleHQocmVjdCwgbV9pc1ByaW50aW5nKTsKLSAg ICAgICAgICAgICAgICAgICAgRGFzaEFycmF5IGludGVyc2VjdGlvbnMgPSBtX2ZvbnQuZGFzaGVz Rm9ySW50ZXJzZWN0aW9uc1dpdGhSZWN0KHRleHRSdW4sIHRleHRPcmlnaW4sIHVuZGVybGluZUJv dW5kaW5nQm94KTsKKyAgICAgICAgICAgICAgICAgICAgYXV0byB1bmRlcmxpbmVCb3VuZGluZ0Jv eCA9IG1fY29udGV4dC5jb21wdXRlVW5kZXJsaW5lQm91bmRzRm9yVGV4dChyZWN0LCBtX2lzUHJp bnRpbmcpOworICAgICAgICAgICAgICAgICAgICBEYXNoQXJyYXkgaW50ZXJzZWN0aW9ucyA9IG1f Zm9udC5kYXNoZXNGb3JJbnRlcnNlY3Rpb25zV2l0aFJlY3QodGV4dFJ1biwgZGVjb3JhdGlvbkdl b21ldHJ5LnRleHRPcmlnaW4sIHVuZGVybGluZUJvdW5kaW5nQm94KTsKICAgICAgICAgICAgICAg ICAgICAgRGFzaEFycmF5IGJvdW5kYXJpZXMgPSB0cmFuc2xhdGVJbnRlcnNlY3Rpb25Qb2ludHNU b1NraXBJbmtCb3VuZGFyaWVzKGludGVyc2VjdGlvbnMsIHVuZGVybGluZUJvdW5kaW5nQm94Lmhl aWdodCgpLCByZWN0LndpZHRoKCkpOwogICAgICAgICAgICAgICAgICAgICBBU1NFUlQoIShib3Vu ZGFyaWVzLnNpemUoKSAlIDIpKTsKICAgICAgICAgICAgICAgICAgICAgLy8gV2UgZG9uJ3QgdXNl IHVuZGVybGluZUJvdW5kaW5nQm94IGhlcmUgYmVjYXVzZSBkcmF3TGluZXNGb3JUZXh0KCkgd2ls bCBydW4gY29tcHV0ZVVuZGVybGluZUJvdW5kc0ZvclRleHQoKSBpbnRlcm5hbGx5LgpAQCAtMjUw LDIwICsyNDYsMjIgQEAgdm9pZCBUZXh0RGVjb3JhdGlvblBhaW50ZXI6OnBhaW50QmFja2dyb3Vu ZERlY29yYXRpb25zKGNvbnN0IFRleHRSdW4mIHRleHRSdW4sIGMKICAgICAgICAgICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOwogICAgIH07CiAKLSAgICBib29sIGFyZUxpbmVzT3BhcXVlID0gIW1f aXNQcmludGluZyAmJiAoIW1fdGV4dERlY29yYXRpb25zLmNvbnRhaW5zKFRleHREZWNvcmF0aW9u TGluZTo6VW5kZXJsaW5lKSB8fCBtX3N0eWxlcy51bmRlcmxpbmUuY29sb3IuaXNPcGFxdWUoKSkK KyAgICBhdXRvIGFyZUxpbmVzT3BhcXVlID0gIW1faXNQcmludGluZyAmJiAoIW1fdGV4dERlY29y YXRpb25zLmNvbnRhaW5zKFRleHREZWNvcmF0aW9uTGluZTo6VW5kZXJsaW5lKSB8fCBtX3N0eWxl cy51bmRlcmxpbmUuY29sb3IuaXNPcGFxdWUoKSkKICAgICAgICAgJiYgKCFtX3RleHREZWNvcmF0 aW9ucy5jb250YWlucyhUZXh0RGVjb3JhdGlvbkxpbmU6Ok92ZXJsaW5lKSB8fCBtX3N0eWxlcy5v dmVybGluZS5jb2xvci5pc09wYXF1ZSgpKQogICAgICAgICAmJiAoIW1fdGV4dERlY29yYXRpb25z LmNvbnRhaW5zKFRleHREZWNvcmF0aW9uTGluZTo6TGluZVRocm91Z2gpIHx8IG1fc3R5bGVzLmxp bmV0aHJvdWdoLmNvbG9yLmlzT3BhcXVlKCkpOwogCi0gICAgZmxvYXQgZXh0cmFPZmZzZXQgPSAw OwotICAgIGJvb2wgY2xpcHBpbmcgPSAhYXJlTGluZXNPcGFxdWUgJiYgbV9zaGFkb3cgJiYgbV9z aGFkb3ctPm5leHQoKTsKKyAgICBmbG9hdCBleHRyYU9mZnNldCA9IDAuZjsKKyAgICBhdXRvIGJv eE9yaWdpbiA9IGRlY29yYXRpb25HZW9tZXRyeS5ib3hPcmlnaW47CisgICAgYm9vbCBjbGlwcGlu ZyA9IG1fc2hhZG93ICYmIG1fc2hhZG93LT5uZXh0KCkgJiYgIWFyZUxpbmVzT3BhcXVlOwogICAg IGlmIChjbGlwcGluZykgewotICAgICAgICBGbG9hdFJlY3QgY2xpcFJlY3QobG9jYWxPcmlnaW4s IEZsb2F0U2l6ZSh3aWR0aCwgZm9udE1ldHJpY3MuYXNjZW50KCkgKyAyKSk7CisgICAgICAgIGF1 dG8mIGZvbnRNZXRyaWNzID0gbV90ZXh0RGVjb3JhdGlvblN0eWxlLm1ldHJpY3NPZlByaW1hcnlG b250KCk7CisgICAgICAgIGF1dG8gY2xpcFJlY3QgPSBGbG9hdFJlY3QgeyBib3hPcmlnaW4sIEZs b2F0U2l6ZSB7IGRlY29yYXRpb25HZW9tZXRyeS50ZXh0Qm94V2lkdGgsIGZvbnRNZXRyaWNzLmFz Y2VudCgpICsgMi5mIH0gfTsKICAgICAgICAgZm9yIChjb25zdCBTaGFkb3dEYXRhKiBzaGFkb3cg PSBtX3NoYWRvdzsgc2hhZG93OyBzaGFkb3cgPSBzaGFkb3ctPm5leHQoKSkgewotICAgICAgICAg ICAgaW50IHNoYWRvd0V4dGVudCA9IHNoYWRvdy0+cGFpbnRpbmdFeHRlbnQoKTsKLSAgICAgICAg ICAgIEZsb2F0UmVjdCBzaGFkb3dSZWN0KGxvY2FsT3JpZ2luLCBGbG9hdFNpemUod2lkdGgsIGZv bnRNZXRyaWNzLmFzY2VudCgpICsgMikpOworICAgICAgICAgICAgYXV0byBzaGFkb3dFeHRlbnQg PSBzaGFkb3ctPnBhaW50aW5nRXh0ZW50KCk7CisgICAgICAgICAgICBhdXRvIHNoYWRvd1JlY3Qg PSBjbGlwUmVjdDsKICAgICAgICAgICAgIHNoYWRvd1JlY3QuaW5mbGF0ZShzaGFkb3dFeHRlbnQp OwotICAgICAgICAgICAgZmxvYXQgc2hhZG93WCA9IExheW91dFVuaXQobV9pc0hvcml6b250YWwg PyBzaGFkb3ctPngoKS52YWx1ZSgpIDogc2hhZG93LT55KCkudmFsdWUoKSk7Ci0gICAgICAgICAg ICBmbG9hdCBzaGFkb3dZID0gTGF5b3V0VW5pdChtX2lzSG9yaXpvbnRhbCA/IHNoYWRvdy0+eSgp LnZhbHVlKCkgOiAtc2hhZG93LT54KCkudmFsdWUoKSk7CisgICAgICAgICAgICBhdXRvIHNoYWRv d1ggPSBtX2lzSG9yaXpvbnRhbCA/IHNoYWRvdy0+eCgpLnZhbHVlKCkgOiBzaGFkb3ctPnkoKS52 YWx1ZSgpOworICAgICAgICAgICAgYXV0byBzaGFkb3dZID0gbV9pc0hvcml6b250YWwgPyBzaGFk b3ctPnkoKS52YWx1ZSgpIDogLXNoYWRvdy0+eCgpLnZhbHVlKCk7CiAgICAgICAgICAgICBzaGFk b3dSZWN0Lm1vdmUoc2hhZG93WCwgc2hhZG93WSk7CiAgICAgICAgICAgICBjbGlwUmVjdC51bml0 ZShzaGFkb3dSZWN0KTsKICAgICAgICAgICAgIGV4dHJhT2Zmc2V0ID0gc3RkOjptYXgoZXh0cmFP ZmZzZXQsIHN0ZDo6bWF4KDAuZiwgc2hhZG93WSkgKyBzaGFkb3dFeHRlbnQpOwpAQCAtMjcxLDM2 ICsyNjksMzggQEAgdm9pZCBUZXh0RGVjb3JhdGlvblBhaW50ZXI6OnBhaW50QmFja2dyb3VuZERl Y29yYXRpb25zKGNvbnN0IFRleHRSdW4mIHRleHRSdW4sIGMKICAgICAgICAgbV9jb250ZXh0LnNh dmUoKTsKICAgICAgICAgbV9jb250ZXh0LmNsaXAoY2xpcFJlY3QpOwogICAgICAgICBleHRyYU9m ZnNldCArPSBmb250TWV0cmljcy5hc2NlbnQoKSArIDI7Ci0gICAgICAgIGxvY2FsT3JpZ2luLm1v dmUoMCwgZXh0cmFPZmZzZXQpOworICAgICAgICBib3hPcmlnaW4ubW92ZSgwLmYsIGV4dHJhT2Zm c2V0KTsKICAgICB9CiAKICAgICAvLyBUaGVzZSBkZWNvcmF0aW9ucyBzaG91bGQgbWF0Y2ggdGhl IHZpc3VhbCBvdmVyZmxvd3MgY29tcHV0ZWQgaW4gdmlzdWFsT3ZlcmZsb3dGb3JEZWNvcmF0aW9u cygpLgotICAgIGF1dG8gdW5kZXJsaW5lUmVjdCA9IEZsb2F0UmVjdCB7IGxvY2FsT3JpZ2luLCBG bG9hdFNpemUod2lkdGgsIHRleHREZWNvcmF0aW9uVGhpY2tuZXNzKSB9OworICAgIGF1dG8gdW5k ZXJsaW5lUmVjdCA9IEZsb2F0UmVjdCB7IGJveE9yaWdpbiwgRmxvYXRTaXplIHsgZGVjb3JhdGlv bkdlb21ldHJ5LnRleHRCb3hXaWR0aCwgZGVjb3JhdGlvbkdlb21ldHJ5LnRleHREZWNvcmF0aW9u VGhpY2tuZXNzIH0gfTsKICAgICBhdXRvIG92ZXJsaW5lUmVjdCA9IHVuZGVybGluZVJlY3Q7CiAg ICAgaWYgKG1fdGV4dERlY29yYXRpb25zLmNvbnRhaW5zKFRleHREZWNvcmF0aW9uTGluZTo6VW5k ZXJsaW5lKSkKLSAgICAgICAgdW5kZXJsaW5lUmVjdC5tb3ZlKDAuZiwgdW5kZXJsaW5lT2Zmc2V0 ICsgKG1fc3R5bGVzLnVuZGVybGluZS5kZWNvcmF0aW9uU3R5bGUgPT0gVGV4dERlY29yYXRpb25T dHlsZTo6V2F2eSA/IHdhdnlPZmZzZXQgOiAwLmYpKTsKLSAgICBpZiAobV90ZXh0RGVjb3JhdGlv bnMuY29udGFpbnMoVGV4dERlY29yYXRpb25MaW5lOjpPdmVybGluZSkpIHsKLSAgICAgICAgYXV0 byBhdXRvVGV4dERlY29yYXRpb25UaGlja25lc3MgPSBjZWlsVG9EZXZpY2VQaXhlbChUZXh0RGVj b3JhdGlvblRoaWNrbmVzczo6Y3JlYXRlV2l0aEF1dG8oKS5yZXNvbHZlKG1fdGV4dERlY29yYXRp b25TdHlsZS5jb21wdXRlZEZvbnRTaXplKCksIGZvbnRNZXRyaWNzKSwgbV9kZXZpY2VTY2FsZUZh Y3Rvcik7Ci0gICAgICAgIG92ZXJsaW5lUmVjdC5tb3ZlKDAuZiwgYXV0b1RleHREZWNvcmF0aW9u VGhpY2tuZXNzIC0gdGV4dERlY29yYXRpb25UaGlja25lc3MgLSAobV9zdHlsZXMub3ZlcmxpbmUu ZGVjb3JhdGlvblN0eWxlID09IFRleHREZWNvcmF0aW9uU3R5bGU6OldhdnkgPyB3YXZ5T2Zmc2V0 IDogMC5mKSk7Ci0gICAgfQorICAgICAgICB1bmRlcmxpbmVSZWN0Lm1vdmUoMC5mLCBkZWNvcmF0 aW9uR2VvbWV0cnkudW5kZXJsaW5lT2Zmc2V0KTsKKyAgICBpZiAobV90ZXh0RGVjb3JhdGlvbnMu Y29udGFpbnMoVGV4dERlY29yYXRpb25MaW5lOjpPdmVybGluZSkpCisgICAgICAgIG92ZXJsaW5l UmVjdC5tb3ZlKDAuZiwgZGVjb3JhdGlvbkdlb21ldHJ5Lm92ZXJsaW5lT2Zmc2V0KTsKIAotICAg IGNvbnN0IFNoYWRvd0RhdGEqIHNoYWRvdyA9IG1fc2hhZG93OworICAgIGF1dG8qIHNoYWRvdyA9 IG1fc2hhZG93OwogICAgIGRvIHsKLSAgICAgICAgaWYgKHNoYWRvdykgeworICAgICAgICBhdXRv IGFwcGx5U2hhZG93SWZOZWVkZWQgPSBbJl0geworICAgICAgICAgICAgaWYgKCFzaGFkb3cpCisg ICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgaWYgKCFzaGFkb3ctPm5leHQoKSkg ewogICAgICAgICAgICAgICAgIC8vIFRoZSBsYXN0IHNldCBvZiBsaW5lcyBwYWludHMgbm9ybWFs bHkgaW5zaWRlIHRoZSBjbGlwLgotICAgICAgICAgICAgICAgIGxvY2FsT3JpZ2luLm1vdmUoMCwg LWV4dHJhT2Zmc2V0KTsKKyAgICAgICAgICAgICAgICBib3hPcmlnaW4ubW92ZSgwLCAtZXh0cmFP ZmZzZXQpOwogICAgICAgICAgICAgICAgIGV4dHJhT2Zmc2V0ID0gMDsKICAgICAgICAgICAgIH0K LSAgICAgICAgICAgIGZsb2F0IHNoYWRvd1ggPSBMYXlvdXRVbml0KG1faXNIb3Jpem9udGFsID8g c2hhZG93LT54KCkudmFsdWUoKSA6IHNoYWRvdy0+eSgpLnZhbHVlKCkpOwotICAgICAgICAgICAg ZmxvYXQgc2hhZG93WSA9IExheW91dFVuaXQobV9pc0hvcml6b250YWwgPyBzaGFkb3ctPnkoKS52 YWx1ZSgpIDogLXNoYWRvdy0+eCgpLnZhbHVlKCkpOwotICAgICAgICAgICAgCi0gICAgICAgICAg ICBDb2xvciBzaGFkb3dDb2xvciA9IHNoYWRvdy0+Y29sb3IoKTsKKyAgICAgICAgICAgIGF1dG8g c2hhZG93Q29sb3IgPSBzaGFkb3ctPmNvbG9yKCk7CiAgICAgICAgICAgICBpZiAobV9zaGFkb3dD b2xvckZpbHRlcikKICAgICAgICAgICAgICAgICBtX3NoYWRvd0NvbG9yRmlsdGVyLT50cmFuc2Zv cm1Db2xvcihzaGFkb3dDb2xvcik7Ci0gICAgICAgICAgICBtX2NvbnRleHQuc2V0U2hhZG93KEZs b2F0U2l6ZShzaGFkb3dYLCBzaGFkb3dZIC0gZXh0cmFPZmZzZXQpLCBzaGFkb3ctPnJhZGl1cygp LnZhbHVlKCksIHNoYWRvd0NvbG9yKTsKKworICAgICAgICAgICAgYXV0byBzaGFkb3dYID0gbV9p c0hvcml6b250YWwgPyBzaGFkb3ctPngoKS52YWx1ZSgpIDogc2hhZG93LT55KCkudmFsdWUoKTsK KyAgICAgICAgICAgIGF1dG8gc2hhZG93WSA9IG1faXNIb3Jpem9udGFsID8gc2hhZG93LT55KCku dmFsdWUoKSA6IC1zaGFkb3ctPngoKS52YWx1ZSgpOworICAgICAgICAgICAgbV9jb250ZXh0LnNl dFNoYWRvdyhGbG9hdFNpemUgeyBzaGFkb3dYLCBzaGFkb3dZIC0gZXh0cmFPZmZzZXQgfSwgc2hh ZG93LT5yYWRpdXMoKS52YWx1ZSgpLCBzaGFkb3dDb2xvcik7CiAgICAgICAgICAgICBzaGFkb3cg PSBzaGFkb3ctPm5leHQoKTsKLSAgICAgICAgfQorICAgICAgICB9OworICAgICAgICBhcHBseVNo YWRvd0lmTmVlZGVkKCk7CisKICAgICAgICAgaWYgKG1fdGV4dERlY29yYXRpb25zLmNvbnRhaW5z KFRleHREZWNvcmF0aW9uTGluZTo6VW5kZXJsaW5lKSkKICAgICAgICAgICAgIHBhaW50RGVjb3Jh dGlvbihUZXh0RGVjb3JhdGlvbkxpbmU6OlVuZGVybGluZSwgbV9zdHlsZXMudW5kZXJsaW5lLmRl Y29yYXRpb25TdHlsZSwgbV9zdHlsZXMudW5kZXJsaW5lLmNvbG9yLCB1bmRlcmxpbmVSZWN0KTsK ICAgICAgICAgaWYgKG1fdGV4dERlY29yYXRpb25zLmNvbnRhaW5zKFRleHREZWNvcmF0aW9uTGlu ZTo6T3ZlcmxpbmUpKQpAQCAtMzA4LDcgKzMwOCw3IEBAIHZvaWQgVGV4dERlY29yYXRpb25QYWlu dGVyOjpwYWludEJhY2tncm91bmREZWNvcmF0aW9ucyhjb25zdCBUZXh0UnVuJiB0ZXh0UnVuLCBj CiAgICAgICAgIC8vIFdlIG9ubHkgd2FudCB0byBwYWludCB0aGUgc2hhZG93LCBoZW5jZSB0aGUg dHJhbnNwYXJlbnQgY29sb3IsIG5vdCB0aGUgYWN0dWFsIGxpbmUtdGhyb3VnaCwKICAgICAgICAg Ly8gd2hpY2ggd2lsbCBiZSBwYWludGVkIGluIHBhaW50Rm9yZWdyb3VuZERlY29yYXRpb25zKCku CiAgICAgICAgIGlmIChzaGFkb3cgJiYgbV90ZXh0RGVjb3JhdGlvbnMuY29udGFpbnMoVGV4dERl Y29yYXRpb25MaW5lOjpMaW5lVGhyb3VnaCkpCi0gICAgICAgICAgICBwYWludExpbmVUaHJvdWdo KENvbG9yOjp0cmFuc3BhcmVudEJsYWNrLCB0ZXh0RGVjb3JhdGlvblRoaWNrbmVzcywgbG9jYWxP cmlnaW4sIHdpZHRoKTsKKyAgICAgICAgICAgIHBhaW50TGluZVRocm91Z2goQ29sb3I6OnRyYW5z cGFyZW50QmxhY2ssIGRlY29yYXRpb25HZW9tZXRyeS50ZXh0RGVjb3JhdGlvblRoaWNrbmVzcywg Ym94T3JpZ2luLCBkZWNvcmF0aW9uR2VvbWV0cnkudGV4dEJveFdpZHRoKTsKICAgICB9IHdoaWxl IChzaGFkb3cpOwogCiAgICAgaWYgKGNsaXBwaW5nKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1RleHREZWNvcmF0aW9uUGFpbnRlci5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1RleHREZWNvcmF0aW9uUGFpbnRlci5oCmluZGV4IDVhZjUzMzczMzkwNi4uMDFiZWQw ODVkYjVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dERlY29yYXRp b25QYWludGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHREZWNvcmF0aW9u UGFpbnRlci5oCkBAIC00Miw3ICs0MiwxNSBAQCBwdWJsaWM6CiAgICAgc3RydWN0IFN0eWxlczsK ICAgICBUZXh0RGVjb3JhdGlvblBhaW50ZXIoR3JhcGhpY3NDb250ZXh0JiwgY29uc3QgUmVuZGVy U3R5bGUmLCBjb25zdCBGb250Q2FzY2FkZSYsIGNvbnN0IFNoYWRvd0RhdGEqLCBjb25zdCBGaWx0 ZXJPcGVyYXRpb25zKiwgU3R5bGVzLCBib29sIGlzUHJpbnRpbmcsIGJvb2wgaXNIb3Jpem9udGFs LCBmbG9hdCBkZXZpY2VTY2FsZUZhY3Rvcik7CiAKLSAgICB2b2lkIHBhaW50QmFja2dyb3VuZERl Y29yYXRpb25zKGNvbnN0IFRleHRSdW4mLCBjb25zdCBGbG9hdFBvaW50JiB0ZXh0T3JpZ2luLCBj b25zdCBGbG9hdFBvaW50JiBib3hPcmlnaW4sIGZsb2F0IHdpZHRoLCBmbG9hdCB1bmRlcmxpbmVP ZmZzZXQsIGZsb2F0IHdhdnlPZmZzZXQpOworICAgIHN0cnVjdCBCYWNrZ3JvdW5kRGVjb3JhdGlv bkdlb21ldHJ5IHsKKyAgICAgICAgRmxvYXRQb2ludCB0ZXh0T3JpZ2luOworICAgICAgICBGbG9h dFBvaW50IGJveE9yaWdpbjsKKyAgICAgICAgZmxvYXQgdGV4dEJveFdpZHRoIHsgMC5mIH07Cisg ICAgICAgIGZsb2F0IHRleHREZWNvcmF0aW9uVGhpY2tuZXNzIHsgMC5mIH07CisgICAgICAgIGZs b2F0IHVuZGVybGluZU9mZnNldCB7IDAuZiB9OworICAgICAgICBmbG9hdCBvdmVybGluZU9mZnNl dCB7IDAuZiB9OworICAgIH07CisgICAgdm9pZCBwYWludEJhY2tncm91bmREZWNvcmF0aW9ucyhj b25zdCBUZXh0UnVuJiwgY29uc3QgQmFja2dyb3VuZERlY29yYXRpb25HZW9tZXRyeSYpOwogICAg IHZvaWQgcGFpbnRGb3JlZ3JvdW5kRGVjb3JhdGlvbnMoY29uc3QgRmxvYXRQb2ludCYgYm94T3Jp Z2luLCBmbG9hdCB3aWR0aCk7CiAKICAgICBzdHJ1Y3QgU3R5bGVzIHsKQEAgLTU3LDYgKzY1LDcg QEAgcHVibGljOgogICAgICAgICBEZWNvcmF0aW9uU3R5bGVBbmRDb2xvciBvdmVybGluZTsKICAg ICAgICAgRGVjb3JhdGlvblN0eWxlQW5kQ29sb3IgbGluZXRocm91Z2g7CiAgICAgfTsKKyAgICBj b25zdCBTdHlsZXMmIG92ZXJyaWRlU3R5bGVzKCkgY29uc3QgeyByZXR1cm4gbV9zdHlsZXM7IH0K ICAgICBPcHRpb25TZXQ8VGV4dERlY29yYXRpb25MaW5lPiB0ZXh0RGVjb3JhdGlvbnMoKSBjb25z dCB7IHJldHVybiBtX3RleHREZWNvcmF0aW9uczsgfQogICAgIHN0YXRpYyBDb2xvciBkZWNvcmF0 aW9uQ29sb3IoY29uc3QgUmVuZGVyU3R5bGUmKTsKICAgICBzdGF0aWMgU3R5bGVzIHN0eWxlc0Zv clJlbmRlcmVyKGNvbnN0IFJlbmRlck9iamVjdCYsIE9wdGlvblNldDxUZXh0RGVjb3JhdGlvbkxp bmU+IHJlcXVlc3RlZERlY29yYXRpb25zLCBib29sIGZpcnN0TGluZVN0eWxlID0gZmFsc2UsIFBz ZXVkb0lkID0gUHNldWRvSWQ6Ok5vbmUpOwo=