205003 2019-12-08 22:21:17 -0800 [WinCairo] Add support of Unicode surrogate pair for simple texts 2019-12-09 17:53:00 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 172565 1 fujii fujii achristensen bfulgham don.olmstead ews-watchlist mmaxfield pvollan ross.kirsling webkit-bug-importer oldest_to_newest 1596763 0 fujii 2019-12-08 22:21:17 -0800 [WinCairo] Add support Unicode surrogate pair for simple texts 1596764 1 385134 fujii 2019-12-08 22:21:35 -0800 Created attachment 385134 WIP patch 1596765 2 fujii 2019-12-08 22:35:39 -0800 screenshots of base and patched. https://ibb.co/album/fE3jgF https://en.wikipedia.org/wiki/Emoticons_%28Unicode_block%29 1596774 3 385137 fujii 2019-12-09 00:28:34 -0800 Created attachment 385137 Patch 1597049 4 385137 fujii 2019-12-09 17:51:43 -0800 Comment on attachment 385137 Patch Clearing flags on attachment: 385137 Committed r253313: <https://trac.webkit.org/changeset/253313> 1597050 5 fujii 2019-12-09 17:51:47 -0800 All reviewed patches have been landed. Closing bug. 1597051 6 webkit-bug-importer 2019-12-09 17:53:00 -0800 <rdar://problem/57777805> 385134 2019-12-08 22:21:35 -0800 2019-12-09 00:28:16 -0800 WIP patch a.diff text/plain 6696 fujii ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2Fj aGVXaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDYWNo ZVdpbi5jcHAKaW5kZXggMGEwZGMxMjY4OWMuLjY4ZDQ4ZTg3NjQ5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udENhY2hlV2luLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udENhY2hlV2luLmNwcApAQCAt MTgzLDggKzE4MywzNiBAQCBzdGF0aWMgY29uc3QgVmVjdG9yPERXT1JELCA0PiYgZ2V0Q0pLQ29k ZVBhZ2VNYXNrcygpCiAgICAgcmV0dXJuIGNvZGVQYWdlTWFza3M7CiB9CiAKLXN0YXRpYyBib29s IGN1cnJlbnRGb250Q29udGFpbnNDaGFyYWN0ZXIoSERDIGhkYywgVUNoYXIgY2hhcmFjdGVyKQor c3RhdGljIGJvb2wgY3VycmVudEZvbnRDb250YWluc0NoYXJhY3Rlck5vbkJNUChIREMgaGRjLCBj b25zdCBVQ2hhciogc3RyKQogeworICAgIEFTU0VSVChVX0lTX0xFQUQoc3RyWzBdKSAmJiBVX0lT X1RSQUlMKHN0clsxXSkpOworCisgICAgU0NSSVBUX0NBQ0hFIHNjID0geyB9OworICAgIFNDUklQ VF9GT05UUFJPUEVSVElFUyBmcCA9IHsgfTsKKyAgICBmcC5jQnl0ZXMgPSBzaXplb2YgZnA7Cisg ICAgU2NyaXB0R2V0Rm9udFByb3BlcnRpZXMoaGRjLCAmc2MsICZmcCk7CisgICAgU2NyaXB0RnJl ZUNhY2hlKCZzYyk7CisKKyAgICB3Y2hhcl90IGdseXBoc1syXSA9IHsgfTsKKyAgICBHQ1BfUkVT VUxUUyBnY3BSZXN1bHRzID0geyB9OworICAgIGdjcFJlc3VsdHMubFN0cnVjdFNpemUgPSBzaXpl b2YgZ2NwUmVzdWx0czsKKyAgICBnY3BSZXN1bHRzLm5HbHlwaHMgPSAyOworICAgIGdjcFJlc3Vs dHMubHBHbHlwaHMgPSBnbHlwaHM7CisgICAgR2V0Q2hhcmFjdGVyUGxhY2VtZW50KGhkYywgd2No YXJGcm9tKHN0ciksIDIsIDAsICZnY3BSZXN1bHRzLCBHQ1BfR0xZUEhTSEFQRSk7CisKKyAgICBp ZiAoZ2NwUmVzdWx0cy5uR2x5cGhzICE9IDEpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBh dXRvIGdseXBoID0gZ2x5cGhzWzBdOworICAgIHJldHVybiAhKGdseXBoID09IGZwLndnQmxhbmsg fHwgZ2x5cGggPT0gZnAud2dJbnZhbGlkIHx8IGdseXBoID09IGZwLndnRGVmYXVsdCk7Cit9CisK K3N0YXRpYyBib29sIGN1cnJlbnRGb250Q29udGFpbnNDaGFyYWN0ZXIoSERDIGhkYywgY29uc3Qg VUNoYXIqIHN0ciwgc2l6ZV90IGxlbmd0aCkKK3sKKyAgICBBU1NFUlQobGVuZ3RoIDw9IDIpOwor ICAgIGlmIChsZW5ndGggPT0gMikKKyAgICAgICAgcmV0dXJuIGN1cnJlbnRGb250Q29udGFpbnND aGFyYWN0ZXJOb25CTVAoaGRjLCBzdHIpOworICAgIFVDaGFyIGNoYXJhY3RlciA9IHN0clswXTsK KwogICAgIHN0YXRpYyBWZWN0b3I8Y2hhciwgNTEyPiBnbHlwaHNldEJ1ZmZlcjsKICAgICBnbHlw aHNldEJ1ZmZlci5yZXNpemUoR2V0Rm9udFVuaWNvZGVSYW5nZXMoaGRjLCAwKSk7CiAgICAgR0xZ UEhTRVQqIGdseXBoc2V0ID0gcmVpbnRlcnByZXRfY2FzdDxHTFlQSFNFVCo+KGdseXBoc2V0QnVm ZmVyLmRhdGEoKSk7CkBAIC0yMTMsMTQgKzI0MSwxNSBAQCBzdGF0aWMgSEZPTlQgY3JlYXRlTUxh bmdGb250KElNTGFuZ0ZvbnRMaW5rVHlwZSogbGFuZ0ZvbnRMaW5rLCBIREMgaGRjLCBEV09SRCBj bwogCiBSZWZQdHI8Rm9udD4gRm9udENhY2hlOjpzeXN0ZW1GYWxsYmFja0ZvckNoYXJhY3RlcnMo Y29uc3QgRm9udERlc2NyaXB0aW9uJiBkZXNjcmlwdGlvbiwgY29uc3QgRm9udCogb3JpZ2luYWxG b250RGF0YSwgSXNGb3JQbGF0Zm9ybUZvbnQsIFByZWZlckNvbG9yZWRGb250LCBjb25zdCBVQ2hh ciogY2hhcmFjdGVycywgdW5zaWduZWQgbGVuZ3RoKQogewotICAgIFVDaGFyIGNoYXJhY3RlciA9 IGNoYXJhY3RlcnNbMF07CiAgICAgUmVmUHRyPEZvbnQ+IGZvbnREYXRhOwogICAgIEhXbmREQyBo ZGMoMCk7CiAgICAgSEZPTlQgcHJpbWFyeUZvbnQgPSBvcmlnaW5hbEZvbnREYXRhLT5wbGF0Zm9y bURhdGEoKS5oZm9udCgpOwogICAgIEhHRElPQkogb2xkRm9udCA9IFNlbGVjdE9iamVjdChoZGMs IHByaW1hcnlGb250KTsKICAgICBIRk9OVCBoZm9udCA9IDA7CisgICAgSU1MYW5nRm9udExpbmtU eXBlKiBsYW5nRm9udExpbmsgPSBnZXRGb250TGlua0ludGVyZmFjZSgpOwogCi0gICAgaWYgKElN TGFuZ0ZvbnRMaW5rVHlwZSogbGFuZ0ZvbnRMaW5rID0gZ2V0Rm9udExpbmtJbnRlcmZhY2UoKSkg eworICAgIGlmIChsZW5ndGggPT0gMSAmJiBsYW5nRm9udExpbmspIHsKKyAgICAgICAgVUNoYXIg Y2hhcmFjdGVyID0gY2hhcmFjdGVyc1swXTsKICAgICAgICAgLy8gVHJ5IE1MYW5nIGZvbnQgbGlu a2luZyBmaXJzdC4KICAgICAgICAgRFdPUkQgY29kZVBhZ2VzID0gMDsKICAgICAgICAgaWYgKFNV Q0NFRURFRChsYW5nRm9udExpbmstPkdldENoYXJDb2RlUGFnZXMoY2hhcmFjdGVyLCAmY29kZVBh Z2VzKSkpIHsKQEAgLTIzNiw3ICsyNjUsNyBAQCBSZWZQdHI8Rm9udD4gRm9udENhY2hlOjpzeXN0 ZW1GYWxsYmFja0ZvckNoYXJhY3RlcnMoY29uc3QgRm9udERlc2NyaXB0aW9uJiBkZXNjcgogICAg ICAgICAgICAgICAgICAgICAgICAgLy8gV2UgYXNrZWQgYWJvdXQgYSBjb2RlIHBhZ2UgdGhhdCBp cyBub3Qgb25lIG9mIHRoZSBjb2RlIHBhZ2VzCiAgICAgICAgICAgICAgICAgICAgICAgICAvLyBy ZXR1cm5lZCBieSBNTGFuZywgc28gdGhlIGZvbnQgbWlnaHQgbm90IGNvbnRhaW4gdGhlIGNoYXJh Y3Rlci4KICAgICAgICAgICAgICAgICAgICAgICAgIFNlbGVjdE9iamVjdChoZGMsIGhmb250KTsK LSAgICAgICAgICAgICAgICAgICAgICAgIGlmICghY3VycmVudEZvbnRDb250YWluc0NoYXJhY3Rl cihoZGMsIGNoYXJhY3RlcikpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmICghY3VycmVu dEZvbnRDb250YWluc0NoYXJhY3RlcihoZGMsIGNoYXJhY3RlcnMsIGxlbmd0aCkpIHsKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBEZWxldGVPYmplY3QoaGZvbnQpOwogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGhmb250ID0gMDsKICAgICAgICAgICAgICAgICAgICAgICAgIH0KQEAg LTI4Nyw3ICszMTYsNyBAQCBSZWZQdHI8Rm9udD4gRm9udENhY2hlOjpzeXN0ZW1GYWxsYmFja0Zv ckNoYXJhY3RlcnMoY29uc3QgRm9udERlc2NyaXB0aW9uJiBkZXNjcgogICAgICAgICBHZXRUZXh0 RmFjZShoZGMsIExGX0ZBQ0VTSVpFLCBuYW1lKTsKICAgICAgICAgZmFtaWx5TmFtZSA9IFN0cmlu ZyhuYW1lKTsKIAotICAgICAgICBpZiAoY29udGFpbnNDaGFyYWN0ZXIgfHwgY3VycmVudEZvbnRD b250YWluc0NoYXJhY3RlcihoZGMsIGNoYXJhY3RlcikpCisgICAgICAgIGlmIChjb250YWluc0No YXJhY3RlciB8fCBjdXJyZW50Rm9udENvbnRhaW5zQ2hhcmFjdGVyKGhkYywgY2hhcmFjdGVycywg bGVuZ3RoKSkKICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIGlmICghbGlua2VkRm9udHMp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vR2x5cGhQ YWdlVHJlZU5vZGVDYWlyb1dpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy93aW4vR2x5cGhQYWdlVHJlZU5vZGVDYWlyb1dpbi5jcHAKaW5kZXggMzhjYWE4YjlkOWIuLjlm YjQxNWE1ZjQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93 aW4vR2x5cGhQYWdlVHJlZU5vZGVDYWlyb1dpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd2luL0dseXBoUGFnZVRyZWVOb2RlQ2Fpcm9XaW4uY3BwCkBAIC0zNywx MCArMzcsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGJvb2wgR2x5cGhQYWdlOjpmaWxsKFVD aGFyKiBidWZmZXIsIHVuc2lnbmVkIGJ1ZmZlckxlbmd0aCkKIHsKLSAgICAvLyBidWZmZXJMZW5n dGggd2lsbCBiZSBncmVhdGVyIHRoYW4gdGhlIHJlcXVlc3RlZCBudW1iZXIgb2YgZ2x5cGhzIGlm IHRoZSBidWZmZXIgY29udGFpbnMgc3Vycm9nYXRlIHBhaXJzLgotICAgIC8vIFdlIHdvbid0IHN1 cHBvcnQgdGhpcyBmb3Igbm93LgotICAgIGlmIChidWZmZXJMZW5ndGggPiBHbHlwaFBhZ2U6OnNp emUpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBBU1NFUlQoYnVmZmVyTGVuZ3RoID09IEds eXBoUGFnZTo6c2l6ZSB8fCBidWZmZXJMZW5ndGggPT0gMiAqIEdseXBoUGFnZTo6c2l6ZSk7CiAK ICAgICBjb25zdCBGb250JiBmb250ID0gdGhpcy0+Zm9udCgpOwogICAgIGJvb2wgaGF2ZUdseXBo cyA9IGZhbHNlOwpAQCAtNDksMTcgKzQ2LDQ1IEBAIGJvb2wgR2x5cGhQYWdlOjpmaWxsKFVDaGFy KiBidWZmZXIsIHVuc2lnbmVkIGJ1ZmZlckxlbmd0aCkKICAgICBTYXZlREMoZGMpOwogICAgIFNl bGVjdE9iamVjdChkYywgZm9udC5wbGF0Zm9ybURhdGEoKS5oZm9udCgpKTsKIAotICAgIFdPUkQg bG9jYWxHbHlwaEJ1ZmZlcltHbHlwaFBhZ2U6OnNpemUgKiAyXTsKLSAgICBEV09SRCByZXN1bHQg PSBHZXRHbHlwaEluZGljZXMoZGMsIHdjaGFyRnJvbShidWZmZXIpLCBidWZmZXJMZW5ndGgsIGxv Y2FsR2x5cGhCdWZmZXIsIEdHSV9NQVJLX05PTkVYSVNUSU5HX0dMWVBIUyk7Ci0gICAgYm9vbCBz dWNjZXNzID0gcmVzdWx0ICE9IEdESV9FUlJPUiAmJiBzdGF0aWNfY2FzdDx1bnNpZ25lZD4ocmVz dWx0KSA9PSBidWZmZXJMZW5ndGg7Ci0gICAgaWYgKHN1Y2Nlc3MpIHsKKyAgICBpZiAoYnVmZmVy TGVuZ3RoID09IEdseXBoUGFnZTo6c2l6ZSkgeworICAgICAgICBXT1JEIGxvY2FsR2x5cGhCdWZm ZXJbR2x5cGhQYWdlOjpzaXplICogMl07CisgICAgICAgIERXT1JEIHJlc3VsdCA9IEdldEdseXBo SW5kaWNlcyhkYywgd2NoYXJGcm9tKGJ1ZmZlciksIGJ1ZmZlckxlbmd0aCwgbG9jYWxHbHlwaEJ1 ZmZlciwgR0dJX01BUktfTk9ORVhJU1RJTkdfR0xZUEhTKTsKKyAgICAgICAgYm9vbCBzdWNjZXNz ID0gcmVzdWx0ICE9IEdESV9FUlJPUiAmJiBzdGF0aWNfY2FzdDx1bnNpZ25lZD4ocmVzdWx0KSA9 PSBidWZmZXJMZW5ndGg7CisKKyAgICAgICAgaWYgKHN1Y2Nlc3MpIHsKKyAgICAgICAgICAgIGZv ciAodW5zaWduZWQgaSA9IDA7IGkgPCBHbHlwaFBhZ2U6OnNpemU7IGkrKykgeworICAgICAgICAg ICAgICAgIEdseXBoIGdseXBoID0gbG9jYWxHbHlwaEJ1ZmZlcltpXTsKKyAgICAgICAgICAgICAg ICBpZiAoZ2x5cGggPT0gMHhmZmZmKQorICAgICAgICAgICAgICAgICAgICBzZXRHbHlwaEZvcklu ZGV4KGksIDApOworICAgICAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAgICAgICBz ZXRHbHlwaEZvckluZGV4KGksIGdseXBoKTsKKyAgICAgICAgICAgICAgICAgICAgaGF2ZUdseXBo cyA9IHRydWU7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICB9Cisg ICAgfSBlbHNlIHsKKyAgICAgICAgU0NSSVBUX0NBQ0hFIHNjID0geyB9OworICAgICAgICBTQ1JJ UFRfRk9OVFBST1BFUlRJRVMgZnAgPSB7IH07CisgICAgICAgIGZwLmNCeXRlcyA9IHNpemVvZiBm cDsKKyAgICAgICAgU2NyaXB0R2V0Rm9udFByb3BlcnRpZXMoZGMsICZzYywgJmZwKTsKKyAgICAg ICAgU2NyaXB0RnJlZUNhY2hlKCZzYyk7CisKICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsg aSA8IEdseXBoUGFnZTo6c2l6ZTsgaSsrKSB7Ci0gICAgICAgICAgICBHbHlwaCBnbHlwaCA9IGxv Y2FsR2x5cGhCdWZmZXJbaV07Ci0gICAgICAgICAgICBpZiAoZ2x5cGggPT0gMHhmZmZmKQotICAg ICAgICAgICAgICAgIHNldEdseXBoRm9ySW5kZXgoaSwgMCk7Ci0gICAgICAgICAgICBlbHNlIHsK LSAgICAgICAgICAgICAgICBzZXRHbHlwaEZvckluZGV4KGksIGdseXBoKTsKLSAgICAgICAgICAg ICAgICBoYXZlR2x5cGhzID0gdHJ1ZTsKKyAgICAgICAgICAgIHdjaGFyX3QgZ2x5cGhzWzJdID0g eyB9OworICAgICAgICAgICAgR0NQX1JFU1VMVFMgZ2NwUmVzdWx0cyA9IHsgfTsKKyAgICAgICAg ICAgIGdjcFJlc3VsdHMubFN0cnVjdFNpemUgPSBzaXplb2YgZ2NwUmVzdWx0czsKKyAgICAgICAg ICAgIGdjcFJlc3VsdHMubkdseXBocyA9IDI7CisgICAgICAgICAgICBnY3BSZXN1bHRzLmxwR2x5 cGhzID0gZ2x5cGhzOworICAgICAgICAgICAgR2V0Q2hhcmFjdGVyUGxhY2VtZW50KGRjLCB3Y2hh ckZyb20oYnVmZmVyKSArIGkgKiAyLCAyLCAwLCAmZ2NwUmVzdWx0cywgR0NQX0dMWVBIU0hBUEUp OworICAgICAgICAgICAgYm9vbCBzdWNjZXNzID0gMSA9PSBnY3BSZXN1bHRzLm5HbHlwaHM7Cisg ICAgICAgICAgICBpZiAoc3VjY2VzcykgeworICAgICAgICAgICAgICAgIGF1dG8gZ2x5cGggPSBn bHlwaHNbMF07CisgICAgICAgICAgICAgICAgaWYgKGdseXBoID09IGZwLndnQmxhbmsgfHwgZ2x5 cGggPT0gZnAud2dJbnZhbGlkIHx8IGdseXBoID09IGZwLndnRGVmYXVsdCkKKyAgICAgICAgICAg ICAgICAgICAgc2V0R2x5cGhGb3JJbmRleChpLCAwKTsKKyAgICAgICAgICAgICAgICBlbHNlIHsK KyAgICAgICAgICAgICAgICAgICAgc2V0R2x5cGhGb3JJbmRleChpLCBnbHlwaCk7CisgICAgICAg ICAgICAgICAgICAgIGhhdmVHbHlwaHMgPSB0cnVlOworICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIH0KICAgICAgICAgfQogICAgIH0K 385137 2019-12-09 00:28:34 -0800 2019-12-09 17:51:43 -0800 Patch bug-205003-20191209172833.patch text/plain 8435 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzMjgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTBhNWNkN2U2OTRhMGJm ZDdlYTcxMjM2Y2QzMzIxODljYjBkYzIwNS4uYzdmZDc0YmJmNDkwMWY5MzdmNjI1MjJkNzgxZjcz YzMwMjljODIzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTEyLTA5ICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5DYWly b10gQWRkIHN1cHBvcnQgb2YgVW5pY29kZSBzdXJyb2dhdGUgcGFpciBmb3Igc2ltcGxlIHRleHRz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDUwMDMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb250Q2Fj aGU6OnN5c3RlbUZhbGxiYWNrRm9yQ2hhcmFjdGVycyBvZiBXaW5kb3dzIHBvcnQgd2FzIHdvcmtp bmcKKyAgICAgICAgb25seSBmb3IgQk1QIGJlY2F1c2UgaXQncyB1c2luZyBHZXRGb250VW5pY29k ZVJhbmdlcyBBUEkgd2hpY2gKKyAgICAgICAgc3VwcG9ydHMgb25seSBCTVAuIFVzZSBHZXRDaGFy YWN0ZXJQbGFjZW1lbnQgQVBJIHRvIGdldCBnbHlwaHMgZm9yCisgICAgICAgIG5vbi1CTVAuCisK KyAgICAgICAgR2x5cGhQYWdlOjpmaWxsIG9mIFdpbkNhaXJvIHBvcnQgd2FzIHdvcmtpbmcgb25s eSBmb3IgQk1QIGJlY2F1c2UKKyAgICAgICAgaXQncyB1c2luZyBHZXRHbHlwaEluZGljZXMgQVBJ IHdoaWNoIHN1cHBvcnRzIG9ubHkgQk1QLiBVc2UKKyAgICAgICAgR2V0Q2hhcmFjdGVyUGxhY2Vt ZW50IEFQSSB0byBnZXQgZ2x5cGhzIGZvciBub24tQk1QLgorCisgICAgICAgIFRoaXMgY2hhbmdl IGNhbiBiZSB0ZXN0ZWQgYnkgcGl4ZWwgdGVzdHMsIGJ1dCBXaW5DYWlybyBwb3J0CisgICAgICAg IGRvZXNuJ3QgaW5jbHVkZSAtZXhwZWN0ZWQucG5nIGZpbGVzIHlldC4gVGVzdGVkIG1hbnVhbGx5 LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDYWNoZVdpbi5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpjdXJyZW50Rm9udENvbnRhaW5zQ2hhcmFjdGVyTm9uQk1QKTogQWRk ZWQuCisgICAgICAgIChXZWJDb3JlOjpjdXJyZW50Rm9udENvbnRhaW5zQ2hhcmFjdGVyKTogQ2hh bmdlZCB0byB0YWtlIGEgc3RyaW5nCisgICAgICAgIGluc3RlYWQgb2YgYSAxNmJpdCBjaGFyYWN0 ZXIuCisgICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OnN5c3RlbUZhbGxiYWNrRm9yQ2hhcmFj dGVycyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dseXBoUGFnZVRyZWVOb2Rl Q2Fpcm9XaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6R2x5cGhQYWdlOjpmaWxsKTogVXNlIEdl dENoYXJhY3RlclBsYWNlbWVudCBmb3Igbm9uLUJNUC4KKwogMjAxOS0xMi0wOCAgUnlvc3VrZSBO aXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBUaGVyZSBzaG91bGQgYmUgb25lIE1p Y3JvdGFza1F1ZXVlIHBlciBFdmVudExvb3AKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDYWNoZVdpbi5jcHAKaW5kZXggMGEwZGMxMjY4OWMzOTU5 YzliMzRhMzgwYmFkMzQ0YjRlZjliNmVhZS4uNjhkNDhlODc2NDk1YTgyNjdlNzU4OTczZjFkZTVh YmMyZTE4MTVmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv d2luL0ZvbnRDYWNoZVdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvd2luL0ZvbnRDYWNoZVdpbi5jcHAKQEAgLTE4Myw4ICsxODMsMzYgQEAgc3RhdGljIGNvbnN0 IFZlY3RvcjxEV09SRCwgND4mIGdldENKS0NvZGVQYWdlTWFza3MoKQogICAgIHJldHVybiBjb2Rl UGFnZU1hc2tzOwogfQogCi1zdGF0aWMgYm9vbCBjdXJyZW50Rm9udENvbnRhaW5zQ2hhcmFjdGVy KEhEQyBoZGMsIFVDaGFyIGNoYXJhY3RlcikKK3N0YXRpYyBib29sIGN1cnJlbnRGb250Q29udGFp bnNDaGFyYWN0ZXJOb25CTVAoSERDIGhkYywgY29uc3QgVUNoYXIqIHN0cikKIHsKKyAgICBBU1NF UlQoVV9JU19MRUFEKHN0clswXSkgJiYgVV9JU19UUkFJTChzdHJbMV0pKTsKKworICAgIFNDUklQ VF9DQUNIRSBzYyA9IHsgfTsKKyAgICBTQ1JJUFRfRk9OVFBST1BFUlRJRVMgZnAgPSB7IH07Cisg ICAgZnAuY0J5dGVzID0gc2l6ZW9mIGZwOworICAgIFNjcmlwdEdldEZvbnRQcm9wZXJ0aWVzKGhk YywgJnNjLCAmZnApOworICAgIFNjcmlwdEZyZWVDYWNoZSgmc2MpOworCisgICAgd2NoYXJfdCBn bHlwaHNbMl0gPSB7IH07CisgICAgR0NQX1JFU1VMVFMgZ2NwUmVzdWx0cyA9IHsgfTsKKyAgICBn Y3BSZXN1bHRzLmxTdHJ1Y3RTaXplID0gc2l6ZW9mIGdjcFJlc3VsdHM7CisgICAgZ2NwUmVzdWx0 cy5uR2x5cGhzID0gMjsKKyAgICBnY3BSZXN1bHRzLmxwR2x5cGhzID0gZ2x5cGhzOworICAgIEdl dENoYXJhY3RlclBsYWNlbWVudChoZGMsIHdjaGFyRnJvbShzdHIpLCAyLCAwLCAmZ2NwUmVzdWx0 cywgR0NQX0dMWVBIU0hBUEUpOworCisgICAgaWYgKGdjcFJlc3VsdHMubkdseXBocyAhPSAxKQor ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgYXV0byBnbHlwaCA9IGdseXBoc1swXTsKKyAgICBy ZXR1cm4gIShnbHlwaCA9PSBmcC53Z0JsYW5rIHx8IGdseXBoID09IGZwLndnSW52YWxpZCB8fCBn bHlwaCA9PSBmcC53Z0RlZmF1bHQpOworfQorCitzdGF0aWMgYm9vbCBjdXJyZW50Rm9udENvbnRh aW5zQ2hhcmFjdGVyKEhEQyBoZGMsIGNvbnN0IFVDaGFyKiBzdHIsIHNpemVfdCBsZW5ndGgpCit7 CisgICAgQVNTRVJUKGxlbmd0aCA8PSAyKTsKKyAgICBpZiAobGVuZ3RoID09IDIpCisgICAgICAg IHJldHVybiBjdXJyZW50Rm9udENvbnRhaW5zQ2hhcmFjdGVyTm9uQk1QKGhkYywgc3RyKTsKKyAg ICBVQ2hhciBjaGFyYWN0ZXIgPSBzdHJbMF07CisKICAgICBzdGF0aWMgVmVjdG9yPGNoYXIsIDUx Mj4gZ2x5cGhzZXRCdWZmZXI7CiAgICAgZ2x5cGhzZXRCdWZmZXIucmVzaXplKEdldEZvbnRVbmlj b2RlUmFuZ2VzKGhkYywgMCkpOwogICAgIEdMWVBIU0VUKiBnbHlwaHNldCA9IHJlaW50ZXJwcmV0 X2Nhc3Q8R0xZUEhTRVQqPihnbHlwaHNldEJ1ZmZlci5kYXRhKCkpOwpAQCAtMjEzLDE0ICsyNDEs MTUgQEAgc3RhdGljIEhGT05UIGNyZWF0ZU1MYW5nRm9udChJTUxhbmdGb250TGlua1R5cGUqIGxh bmdGb250TGluaywgSERDIGhkYywgRFdPUkQgY28KIAogUmVmUHRyPEZvbnQ+IEZvbnRDYWNoZTo6 c3lzdGVtRmFsbGJhY2tGb3JDaGFyYWN0ZXJzKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZGVzY3Jp cHRpb24sIGNvbnN0IEZvbnQqIG9yaWdpbmFsRm9udERhdGEsIElzRm9yUGxhdGZvcm1Gb250LCBQ cmVmZXJDb2xvcmVkRm9udCwgY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIHVuc2lnbmVkIGxlbmd0 aCkKIHsKLSAgICBVQ2hhciBjaGFyYWN0ZXIgPSBjaGFyYWN0ZXJzWzBdOwogICAgIFJlZlB0cjxG b250PiBmb250RGF0YTsKICAgICBIV25kREMgaGRjKDApOwogICAgIEhGT05UIHByaW1hcnlGb250 ID0gb3JpZ2luYWxGb250RGF0YS0+cGxhdGZvcm1EYXRhKCkuaGZvbnQoKTsKICAgICBIR0RJT0JK IG9sZEZvbnQgPSBTZWxlY3RPYmplY3QoaGRjLCBwcmltYXJ5Rm9udCk7CiAgICAgSEZPTlQgaGZv bnQgPSAwOworICAgIElNTGFuZ0ZvbnRMaW5rVHlwZSogbGFuZ0ZvbnRMaW5rID0gZ2V0Rm9udExp bmtJbnRlcmZhY2UoKTsKIAotICAgIGlmIChJTUxhbmdGb250TGlua1R5cGUqIGxhbmdGb250TGlu ayA9IGdldEZvbnRMaW5rSW50ZXJmYWNlKCkpIHsKKyAgICBpZiAobGVuZ3RoID09IDEgJiYgbGFu Z0ZvbnRMaW5rKSB7CisgICAgICAgIFVDaGFyIGNoYXJhY3RlciA9IGNoYXJhY3RlcnNbMF07CiAg ICAgICAgIC8vIFRyeSBNTGFuZyBmb250IGxpbmtpbmcgZmlyc3QuCiAgICAgICAgIERXT1JEIGNv ZGVQYWdlcyA9IDA7CiAgICAgICAgIGlmIChTVUNDRUVERUQobGFuZ0ZvbnRMaW5rLT5HZXRDaGFy Q29kZVBhZ2VzKGNoYXJhY3RlciwgJmNvZGVQYWdlcykpKSB7CkBAIC0yMzYsNyArMjY1LDcgQEAg UmVmUHRyPEZvbnQ+IEZvbnRDYWNoZTo6c3lzdGVtRmFsbGJhY2tGb3JDaGFyYWN0ZXJzKGNvbnN0 IEZvbnREZXNjcmlwdGlvbiYgZGVzY3IKICAgICAgICAgICAgICAgICAgICAgICAgIC8vIFdlIGFz a2VkIGFib3V0IGEgY29kZSBwYWdlIHRoYXQgaXMgbm90IG9uZSBvZiB0aGUgY29kZSBwYWdlcwog ICAgICAgICAgICAgICAgICAgICAgICAgLy8gcmV0dXJuZWQgYnkgTUxhbmcsIHNvIHRoZSBmb250 IG1pZ2h0IG5vdCBjb250YWluIHRoZSBjaGFyYWN0ZXIuCiAgICAgICAgICAgICAgICAgICAgICAg ICBTZWxlY3RPYmplY3QoaGRjLCBoZm9udCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAo IWN1cnJlbnRGb250Q29udGFpbnNDaGFyYWN0ZXIoaGRjLCBjaGFyYWN0ZXIpKSB7CisgICAgICAg ICAgICAgICAgICAgICAgICBpZiAoIWN1cnJlbnRGb250Q29udGFpbnNDaGFyYWN0ZXIoaGRjLCBj aGFyYWN0ZXJzLCBsZW5ndGgpKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRGVsZXRl T2JqZWN0KGhmb250KTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBoZm9udCA9IDA7CiAg ICAgICAgICAgICAgICAgICAgICAgICB9CkBAIC0yODcsNyArMzE2LDcgQEAgUmVmUHRyPEZvbnQ+ IEZvbnRDYWNoZTo6c3lzdGVtRmFsbGJhY2tGb3JDaGFyYWN0ZXJzKGNvbnN0IEZvbnREZXNjcmlw dGlvbiYgZGVzY3IKICAgICAgICAgR2V0VGV4dEZhY2UoaGRjLCBMRl9GQUNFU0laRSwgbmFtZSk7 CiAgICAgICAgIGZhbWlseU5hbWUgPSBTdHJpbmcobmFtZSk7CiAKLSAgICAgICAgaWYgKGNvbnRh aW5zQ2hhcmFjdGVyIHx8IGN1cnJlbnRGb250Q29udGFpbnNDaGFyYWN0ZXIoaGRjLCBjaGFyYWN0 ZXIpKQorICAgICAgICBpZiAoY29udGFpbnNDaGFyYWN0ZXIgfHwgY3VycmVudEZvbnRDb250YWlu c0NoYXJhY3RlcihoZGMsIGNoYXJhY3RlcnMsIGxlbmd0aCkpCiAgICAgICAgICAgICBicmVhazsK IAogICAgICAgICBpZiAoIWxpbmtlZEZvbnRzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dseXBoUGFnZVRyZWVOb2RlQ2Fpcm9XaW4uY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dseXBoUGFnZVRyZWVOb2RlQ2Fpcm9X aW4uY3BwCmluZGV4IDM4Y2FhOGI5ZDliMmNkYjUyMWZiNTNjOTdlZGQ4ZDYwNDVjMjEyOTMuLjlm YjQxNWE1ZjQ4ZjNjZTE3Y2QyNGY4NDg0NGQzYTc1ZWFmYWJhZTEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9HbHlwaFBhZ2VUcmVlTm9kZUNhaXJvV2lu LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vR2x5cGhQYWdl VHJlZU5vZGVDYWlyb1dpbi5jcHAKQEAgLTM3LDEwICszNyw3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAogYm9vbCBHbHlwaFBhZ2U6OmZpbGwoVUNoYXIqIGJ1ZmZlciwgdW5zaWduZWQgYnVmZmVy TGVuZ3RoKQogewotICAgIC8vIGJ1ZmZlckxlbmd0aCB3aWxsIGJlIGdyZWF0ZXIgdGhhbiB0aGUg cmVxdWVzdGVkIG51bWJlciBvZiBnbHlwaHMgaWYgdGhlIGJ1ZmZlciBjb250YWlucyBzdXJyb2dh dGUgcGFpcnMuCi0gICAgLy8gV2Ugd29uJ3Qgc3VwcG9ydCB0aGlzIGZvciBub3cuCi0gICAgaWYg KGJ1ZmZlckxlbmd0aCA+IEdseXBoUGFnZTo6c2l6ZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgIEFTU0VSVChidWZmZXJMZW5ndGggPT0gR2x5cGhQYWdlOjpzaXplIHx8IGJ1ZmZlckxlbmd0 aCA9PSAyICogR2x5cGhQYWdlOjpzaXplKTsKIAogICAgIGNvbnN0IEZvbnQmIGZvbnQgPSB0aGlz LT5mb250KCk7CiAgICAgYm9vbCBoYXZlR2x5cGhzID0gZmFsc2U7CkBAIC00OSwxNyArNDYsNDUg QEAgYm9vbCBHbHlwaFBhZ2U6OmZpbGwoVUNoYXIqIGJ1ZmZlciwgdW5zaWduZWQgYnVmZmVyTGVu Z3RoKQogICAgIFNhdmVEQyhkYyk7CiAgICAgU2VsZWN0T2JqZWN0KGRjLCBmb250LnBsYXRmb3Jt RGF0YSgpLmhmb250KCkpOwogCi0gICAgV09SRCBsb2NhbEdseXBoQnVmZmVyW0dseXBoUGFnZTo6 c2l6ZSAqIDJdOwotICAgIERXT1JEIHJlc3VsdCA9IEdldEdseXBoSW5kaWNlcyhkYywgd2NoYXJG cm9tKGJ1ZmZlciksIGJ1ZmZlckxlbmd0aCwgbG9jYWxHbHlwaEJ1ZmZlciwgR0dJX01BUktfTk9O RVhJU1RJTkdfR0xZUEhTKTsKLSAgICBib29sIHN1Y2Nlc3MgPSByZXN1bHQgIT0gR0RJX0VSUk9S ICYmIHN0YXRpY19jYXN0PHVuc2lnbmVkPihyZXN1bHQpID09IGJ1ZmZlckxlbmd0aDsKLSAgICBp ZiAoc3VjY2VzcykgeworICAgIGlmIChidWZmZXJMZW5ndGggPT0gR2x5cGhQYWdlOjpzaXplKSB7 CisgICAgICAgIFdPUkQgbG9jYWxHbHlwaEJ1ZmZlcltHbHlwaFBhZ2U6OnNpemUgKiAyXTsKKyAg ICAgICAgRFdPUkQgcmVzdWx0ID0gR2V0R2x5cGhJbmRpY2VzKGRjLCB3Y2hhckZyb20oYnVmZmVy KSwgYnVmZmVyTGVuZ3RoLCBsb2NhbEdseXBoQnVmZmVyLCBHR0lfTUFSS19OT05FWElTVElOR19H TFlQSFMpOworICAgICAgICBib29sIHN1Y2Nlc3MgPSByZXN1bHQgIT0gR0RJX0VSUk9SICYmIHN0 YXRpY19jYXN0PHVuc2lnbmVkPihyZXN1bHQpID09IGJ1ZmZlckxlbmd0aDsKKworICAgICAgICBp ZiAoc3VjY2VzcykgeworICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IEdseXBo UGFnZTo6c2l6ZTsgaSsrKSB7CisgICAgICAgICAgICAgICAgR2x5cGggZ2x5cGggPSBsb2NhbEds eXBoQnVmZmVyW2ldOworICAgICAgICAgICAgICAgIGlmIChnbHlwaCA9PSAweGZmZmYpCisgICAg ICAgICAgICAgICAgICAgIHNldEdseXBoRm9ySW5kZXgoaSwgMCk7CisgICAgICAgICAgICAgICAg ZWxzZSB7CisgICAgICAgICAgICAgICAgICAgIHNldEdseXBoRm9ySW5kZXgoaSwgZ2x5cGgpOwor ICAgICAgICAgICAgICAgICAgICBoYXZlR2x5cGhzID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICB9 CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9IGVsc2UgeworICAgICAgICBTQ1JJUFRf Q0FDSEUgc2MgPSB7IH07CisgICAgICAgIFNDUklQVF9GT05UUFJPUEVSVElFUyBmcCA9IHsgfTsK KyAgICAgICAgZnAuY0J5dGVzID0gc2l6ZW9mIGZwOworICAgICAgICBTY3JpcHRHZXRGb250UHJv cGVydGllcyhkYywgJnNjLCAmZnApOworICAgICAgICBTY3JpcHRGcmVlQ2FjaGUoJnNjKTsKKwog ICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgR2x5cGhQYWdlOjpzaXplOyBpKyspIHsK LSAgICAgICAgICAgIEdseXBoIGdseXBoID0gbG9jYWxHbHlwaEJ1ZmZlcltpXTsKLSAgICAgICAg ICAgIGlmIChnbHlwaCA9PSAweGZmZmYpCi0gICAgICAgICAgICAgICAgc2V0R2x5cGhGb3JJbmRl eChpLCAwKTsKLSAgICAgICAgICAgIGVsc2UgewotICAgICAgICAgICAgICAgIHNldEdseXBoRm9y SW5kZXgoaSwgZ2x5cGgpOwotICAgICAgICAgICAgICAgIGhhdmVHbHlwaHMgPSB0cnVlOworICAg ICAgICAgICAgd2NoYXJfdCBnbHlwaHNbMl0gPSB7IH07CisgICAgICAgICAgICBHQ1BfUkVTVUxU UyBnY3BSZXN1bHRzID0geyB9OworICAgICAgICAgICAgZ2NwUmVzdWx0cy5sU3RydWN0U2l6ZSA9 IHNpemVvZiBnY3BSZXN1bHRzOworICAgICAgICAgICAgZ2NwUmVzdWx0cy5uR2x5cGhzID0gMjsK KyAgICAgICAgICAgIGdjcFJlc3VsdHMubHBHbHlwaHMgPSBnbHlwaHM7CisgICAgICAgICAgICBH ZXRDaGFyYWN0ZXJQbGFjZW1lbnQoZGMsIHdjaGFyRnJvbShidWZmZXIpICsgaSAqIDIsIDIsIDAs ICZnY3BSZXN1bHRzLCBHQ1BfR0xZUEhTSEFQRSk7CisgICAgICAgICAgICBib29sIHN1Y2Nlc3Mg PSAxID09IGdjcFJlc3VsdHMubkdseXBoczsKKyAgICAgICAgICAgIGlmIChzdWNjZXNzKSB7Cisg ICAgICAgICAgICAgICAgYXV0byBnbHlwaCA9IGdseXBoc1swXTsKKyAgICAgICAgICAgICAgICBp ZiAoZ2x5cGggPT0gZnAud2dCbGFuayB8fCBnbHlwaCA9PSBmcC53Z0ludmFsaWQgfHwgZ2x5cGgg PT0gZnAud2dEZWZhdWx0KQorICAgICAgICAgICAgICAgICAgICBzZXRHbHlwaEZvckluZGV4KGks IDApOworICAgICAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAgICAgICBzZXRHbHlw aEZvckluZGV4KGksIGdseXBoKTsKKyAgICAgICAgICAgICAgICAgICAgaGF2ZUdseXBocyA9IHRy dWU7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQo=