182828 2018-02-15 05:33:49 -0800 HarfBuzzFace: rework cache entry reference holding 2018-02-15 11:07:31 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zan zan bugs-noreply mcatanzaro webkit-bug-importer oldest_to_newest 1399434 0 zan 2018-02-15 05:33:49 -0800 HarfBuzzFace: rework cache entry reference holding 1399436 1 333893 zan 2018-02-15 05:45:44 -0800 Created attachment 333893 Patch 1399446 2 zan 2018-02-15 06:30:29 -0800 (In reply to Zan Dobersek from comment #1) > Created attachment 333893 [details] > Patch Patch already up. 1399532 3 333893 zan 2018-02-15 11:06:07 -0800 Comment on attachment 333893 Patch Clearing flags on attachment: 333893 Committed r228525: <https://trac.webkit.org/changeset/228525> 1399533 4 zan 2018-02-15 11:06:11 -0800 All reviewed patches have been landed. Closing bug. 1399536 5 webkit-bug-importer 2018-02-15 11:07:31 -0800 <rdar://problem/37576421> 333893 2018-02-15 05:45:44 -0800 2018-02-15 11:06:07 -0800 Patch bug-182828-20180215144543.patch text/plain 9408 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2RjMDBhZTFlYWE4MzQw NGJiOTYxOTI1ZjM2Y2Q4MjMwYjUyYzExYi4uZTBkZjZmMjU0ZjZkMTBkMjQ1Y2EyZjQ1MTM4NmU2 ZjVkZWJkY2ZkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ3IEBACiAyMDE4LTAyLTE1ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAorICAgICAgICBIYXJmQnV6ekZhY2U6 IHJld29yayBjYWNoZSBlbnRyeSByZWZlcmVuY2UgaG9sZGluZworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgyODI4CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSB0aGUgRmFjZUNhY2hlRW50cnkgYW5k IEhhcmZCdXp6RmFjZUNhY2hlIHR5cGVzIGludG8gdGhlCisgICAgICAgIEhhcmZCdXp6RmFjZSBj bGFzcyBhcyBDYWNoZUVudHJ5IGFuZCBDYWNoZSwgcmVzcGVjdGl2ZWx5LiBUaGUgQ2FjaGUKKyAg ICAgICAgc2luZ2xldG9uIGlzIGFsc28gbW92ZWQgdGhlcmUuCisKKyAgICAgICAgSW4gdGhlIEhh cmZCdXp6RmFjZSBjb25zdHJ1Y3Rvciwgd2Ugbm93IGRvbid0IGluY3JlYXNlIHRoZSBDYWNoZUVu dHJ5CisgICAgICAgIHJlZmVyZW5jZSwgYnV0IGluc3RlYWQganVzdCBrZWVwIGEgcmVmZXJlbmNl IHRvIHRoYXQgb2JqZWN0IHRocm91Z2gKKyAgICAgICAgYSBSZWZQdHI8Q2FjaGVFbnRyeT4gb2Jq ZWN0LiBXZSBkb24ndCBuZWVkIHRvIHJldHJpZXZlIHRoZSBoYl9mYWNlX3QKKyAgICAgICAgb2Jq ZWN0IGFuZCB0aGUgZ2x5cGggY2FjaGUgSGFzaE1hcCBpbiB0aGUgY29uc3RydWN0b3IgYW55bW9y ZSwgd2UganVzdAorICAgICAgICByZXRyaWV2ZSB0aGVtIHdoZW4gbmVjZXNzYXJ5IHRocm91Z2gg dGhhdCBDYWNoZUVudHJ5IHJlZmVyZW5jZS4KKworICAgICAgICBJbiB0aGUgZGVzdHJ1Y3Rvciwg dGhhdCBSZWZQdHI8Q2FjaGVFbnRyeT4gb2JqZWN0IGlzIG51bGxlZCBvdXQgYmVmb3JlCisgICAg ICAgIHRoZSBvYmplY3QgaW4gQ2FjaGUgaXMgcmVtb3ZlZCBpZiB0aGF0J3Mgd2hlcmUgdGhlIGZp bmFsIHJlZmVyZW5jZSBpcworICAgICAgICBrZXB0LgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvaGFyZmJ1enovSGFyZkJ1enpGYWNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhhcmZC dXp6RmFjZTo6Q2FjaGVFbnRyeTo6Q2FjaGVFbnRyeSk6CisgICAgICAgIChXZWJDb3JlOjpIYXJm QnV6ekZhY2U6OkNhY2hlRW50cnk6On5DYWNoZUVudHJ5KToKKyAgICAgICAgKFdlYkNvcmU6Okhh cmZCdXp6RmFjZTo6Y2FjaGUpOgorICAgICAgICAoV2ViQ29yZTo6SGFyZkJ1enpGYWNlOjpIYXJm QnV6ekZhY2UpOgorICAgICAgICAoV2ViQ29yZTo6SGFyZkJ1enpGYWNlOjp+SGFyZkJ1enpGYWNl KToKKyAgICAgICAgKFdlYkNvcmU6OkhhcmZCdXp6RmFjZTo6c2V0U2NyaXB0Rm9yVmVydGljYWxH bHlwaFN1YnN0aXR1dGlvbik6CisgICAgICAgIChXZWJDb3JlOjpGYWNlQ2FjaGVFbnRyeTo6Y3Jl YXRlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkZhY2VDYWNoZUVudHJ5Ojp+RmFjZUNh Y2hlRW50cnkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RmFjZUNhY2hlRW50cnk6OmZh Y2UpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RmFjZUNhY2hlRW50cnk6OmdseXBoQ2Fj aGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RmFjZUNhY2hlRW50cnk6OkZhY2VDYWNo ZUVudHJ5KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmhhcmZCdXp6RmFjZUNhY2hlKTog RGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6ekZh Y2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OkhhcmZCdXp6RmFjZTo6Q2FjaGVFbnRyeTo6Y3JlYXRl KToKKyAgICAgICAgKFdlYkNvcmU6OkhhcmZCdXp6RmFjZTo6Q2FjaGVFbnRyeTo6ZmFjZSk6Cisg ICAgICAgIChXZWJDb3JlOjpIYXJmQnV6ekZhY2U6OkNhY2hlRW50cnk6OmdseXBoQ2FjaGUpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6RmFjZUNhaXJvLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OmhhcmZCdXp6R2V0R2x5cGgpOgorICAgICAgICAoV2ViQ29y ZTo6SGFyZkJ1enpGYWNlOjpjcmVhdGVGb250KToKKworMjAxOC0wMi0xNSAgWmFuIERvYmVyc2Vr ICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CisKICAgICAgICAgQ2xlYW4gdXAgSGFyZkJ1enpGYWNl Q2Fpcm8KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 MjgyNAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJm YnV6ei9IYXJmQnV6ekZhY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv aGFyZmJ1enovSGFyZkJ1enpGYWNlLmNwcAppbmRleCA3OTE5NWEyMzUxN2E5NmY3ZDgxNzYyMzdk MWE0ODI3MDVjMzY4ZWIwLi5lYjYzNzNkMzdlNThiOGM1M2UzNjU2ZTM4YzVkZjFmYzFjNzk3ZjY0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9I YXJmQnV6ekZhY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hh cmZidXp6L0hhcmZCdXp6RmFjZS5jcHAKQEAgLTQ3LDM2ICs0NywyMSBAQCBjb25zdCBoYl90YWdf dCBIYXJmQnV6ekZhY2U6Omtlcm5UYWcgPSBIQl9UQUcoJ2snLCAnZScsICdyJywgJ24nKTsKIC8v IHRvIHJlZHVjZSB0aGUgbWVtb3J5IGNvbnN1bXB0aW9uIGJlY2F1c2UgaGJfZmFjZV90IHNob3Vs ZCBiZSBhc3NvY2lhdGVkIHdpdGgKIC8vIHVuZGVybGluZyBmb250IGRhdGEgKGUuZy4gQ1RGb250 UmVmLCBGVEZhY2UpLgogCi1jbGFzcyBGYWNlQ2FjaGVFbnRyeSA6IHB1YmxpYyBSZWZDb3VudGVk PEZhY2VDYWNoZUVudHJ5PiB7Ci1wdWJsaWM6Ci0gICAgc3RhdGljIFJlZjxGYWNlQ2FjaGVFbnRy eT4gY3JlYXRlKGhiX2ZhY2VfdCogZmFjZSkKLSAgICB7Ci0gICAgICAgIEFTU0VSVChmYWNlKTsK LSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgRmFjZUNhY2hlRW50cnkoZmFjZSkpOwotICAg IH0KLSAgICB+RmFjZUNhY2hlRW50cnkoKQotICAgIHsKLSAgICAgICAgaGJfZmFjZV9kZXN0cm95 KG1fZmFjZSk7Ci0gICAgfQotCi0gICAgaGJfZmFjZV90KiBmYWNlKCkgeyByZXR1cm4gbV9mYWNl OyB9Ci0gICAgSGFzaE1hcDx1aW50MzJfdCwgdWludDE2X3Q+KiBnbHlwaENhY2hlKCkgeyByZXR1 cm4gJm1fZ2x5cGhDYWNoZTsgfQotCi1wcml2YXRlOgotICAgIGV4cGxpY2l0IEZhY2VDYWNoZUVu dHJ5KGhiX2ZhY2VfdCogZmFjZSkKLSAgICAgICAgOiBtX2ZhY2UoZmFjZSkKLSAgICB7IH0KLQot ICAgIGhiX2ZhY2VfdCogbV9mYWNlOwotICAgIEhhc2hNYXA8dWludDMyX3QsIHVpbnQxNl90PiBt X2dseXBoQ2FjaGU7Ci19OworSGFyZkJ1enpGYWNlOjpDYWNoZUVudHJ5OjpDYWNoZUVudHJ5KGhi X2ZhY2VfdCogZmFjZSkKKyAgICA6IG1fZmFjZShmYWNlKQoreworICAgIEFTU0VSVChtX2ZhY2Up OworfQogCi10eXBlZGVmIEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxGYWNlQ2FjaGVFbnRyeT4s IFdURjo6SW50SGFzaDx1aW50NjRfdD4sIFdURjo6VW5zaWduZWRXaXRoWmVyb0tleUhhc2hUcmFp dHM8dWludDY0X3Q+ID4gSGFyZkJ1enpGYWNlQ2FjaGU7CitIYXJmQnV6ekZhY2U6OkNhY2hlRW50 cnk6On5DYWNoZUVudHJ5KCkKK3sKKyAgICBoYl9mYWNlX2Rlc3Ryb3kobV9mYWNlKTsKK30KIAot c3RhdGljIEhhcmZCdXp6RmFjZUNhY2hlKiBoYXJmQnV6ekZhY2VDYWNoZSgpCitIYXJmQnV6ekZh Y2U6OkNhY2hlJiBIYXJmQnV6ekZhY2U6OmNhY2hlKCkKIHsKLSAgICBzdGF0aWMgTmV2ZXJEZXN0 cm95ZWQ8SGFyZkJ1enpGYWNlQ2FjaGU+IHNfaGFyZkJ1enpGYWNlQ2FjaGU7Ci0gICAgcmV0dXJu ICZzX2hhcmZCdXp6RmFjZUNhY2hlLmdldCgpOworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxD YWNoZT4gc19jYWNoZTsKKyAgICByZXR1cm4gc19jYWNoZTsKIH0KIAogSGFyZkJ1enpGYWNlOjpI YXJmQnV6ekZhY2UoRm9udFBsYXRmb3JtRGF0YSogcGxhdGZvcm1EYXRhLCB1aW50NjRfdCB1bmlx dWVJRCkKQEAgLTg0LDIyICs2OSwyMiBAQCBIYXJmQnV6ekZhY2U6OkhhcmZCdXp6RmFjZShGb250 UGxhdGZvcm1EYXRhKiBwbGF0Zm9ybURhdGEsIHVpbnQ2NF90IHVuaXF1ZUlEKQogICAgICwgbV91 bmlxdWVJRCh1bmlxdWVJRCkKICAgICAsIG1fc2NyaXB0Rm9yVmVydGljYWxUZXh0KEhCX1NDUklQ VF9JTlZBTElEKQogewotICAgIEhhcmZCdXp6RmFjZUNhY2hlOjpBZGRSZXN1bHQgcmVzdWx0ID0g aGFyZkJ1enpGYWNlQ2FjaGUoKS0+YWRkKG1fdW5pcXVlSUQsIG51bGxwdHIpOworICAgIGF1dG8g cmVzdWx0ID0gY2FjaGUoKS5hZGQobV91bmlxdWVJRCwgbnVsbHB0cik7CiAgICAgaWYgKHJlc3Vs dC5pc05ld0VudHJ5KQotICAgICAgICByZXN1bHQuaXRlcmF0b3ItPnZhbHVlID0gRmFjZUNhY2hl RW50cnk6OmNyZWF0ZShjcmVhdGVGYWNlKCkpOwotICAgIHJlc3VsdC5pdGVyYXRvci0+dmFsdWUt PnJlZigpOwotICAgIG1fZmFjZSA9IHJlc3VsdC5pdGVyYXRvci0+dmFsdWUtPmZhY2UoKTsKLSAg ICBtX2dseXBoQ2FjaGVGb3JGYWNlQ2FjaGVFbnRyeSA9IHJlc3VsdC5pdGVyYXRvci0+dmFsdWUt PmdseXBoQ2FjaGUoKTsKKyAgICAgICAgcmVzdWx0Lml0ZXJhdG9yLT52YWx1ZSA9IENhY2hlRW50 cnk6OmNyZWF0ZShjcmVhdGVGYWNlKCkpOworICAgIG1fY2FjaGVFbnRyeSA9IHJlc3VsdC5pdGVy YXRvci0+dmFsdWU7CiB9CiAKIEhhcmZCdXp6RmFjZTo6fkhhcmZCdXp6RmFjZSgpCiB7Ci0gICAg SGFyZkJ1enpGYWNlQ2FjaGU6Oml0ZXJhdG9yIHJlc3VsdCA9IGhhcmZCdXp6RmFjZUNhY2hlKCkt PmZpbmQobV91bmlxdWVJRCk7Ci0gICAgQVNTRVJUKHJlc3VsdCAhPSBoYXJmQnV6ekZhY2VDYWNo ZSgpLT5lbmQoKSk7Ci0gICAgQVNTRVJUKHJlc3VsdC5nZXQoKS0+dmFsdWUtPnJlZkNvdW50KCkg PiAxKTsKLSAgICByZXN1bHQuZ2V0KCktPnZhbHVlLT5kZXJlZigpOwotICAgIGlmIChyZXN1bHQu Z2V0KCktPnZhbHVlLT5yZWZDb3VudCgpID09IDEpCi0gICAgICAgIGhhcmZCdXp6RmFjZUNhY2hl KCktPnJlbW92ZShtX3VuaXF1ZUlEKTsKKyAgICBhdXRvIGl0ID0gY2FjaGUoKS5maW5kKG1fdW5p cXVlSUQpOworICAgIEFTU0VSVChpdCAhPSBjYWNoZSgpLmVuZCgpKTsKKyAgICBBU1NFUlQoaXQt PnZhbHVlID09IG1fY2FjaGVFbnRyeSk7CisgICAgQVNTRVJUKGl0LT52YWx1ZS0+cmVmQ291bnQo KSA+IDEpOworCisgICAgbV9jYWNoZUVudHJ5ID0gbnVsbHB0cjsKKyAgICBpZiAoaXQtPnZhbHVl LT5yZWZDb3VudCgpID09IDEpCisgICAgICAgIGNhY2hlKCkucmVtb3ZlKGl0KTsKIH0KIAogc3Rh dGljIGhiX3NjcmlwdF90IGZpbmRTY3JpcHRGb3JWZXJ0aWNhbEdseXBoU3Vic3RpdHV0aW9uKGhi X2ZhY2VfdCogZmFjZSkKQEAgLTEyNiw3ICsxMTEsNyBAQCBzdGF0aWMgaGJfc2NyaXB0X3QgZmlu ZFNjcmlwdEZvclZlcnRpY2FsR2x5cGhTdWJzdGl0dXRpb24oaGJfZmFjZV90KiBmYWNlKQogdm9p ZCBIYXJmQnV6ekZhY2U6OnNldFNjcmlwdEZvclZlcnRpY2FsR2x5cGhTdWJzdGl0dXRpb24oaGJf YnVmZmVyX3QqIGJ1ZmZlcikKIHsKICAgICBpZiAobV9zY3JpcHRGb3JWZXJ0aWNhbFRleHQgPT0g SEJfU0NSSVBUX0lOVkFMSUQpCi0gICAgICAgIG1fc2NyaXB0Rm9yVmVydGljYWxUZXh0ID0gZmlu ZFNjcmlwdEZvclZlcnRpY2FsR2x5cGhTdWJzdGl0dXRpb24obV9mYWNlKTsKKyAgICAgICAgbV9z Y3JpcHRGb3JWZXJ0aWNhbFRleHQgPSBmaW5kU2NyaXB0Rm9yVmVydGljYWxHbHlwaFN1YnN0aXR1 dGlvbihtX2NhY2hlRW50cnktPmZhY2UoKSk7CiAgICAgaGJfYnVmZmVyX3NldF9zY3JpcHQoYnVm ZmVyLCBtX3NjcmlwdEZvclZlcnRpY2FsVGV4dCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6RmFjZS5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1enpGYWNlLmgKaW5kZXgg Zjk3ZDAxZjdiMjE0NjQxZjhlMmVlNWQ1YzUzOTRlYTFlZmUyMWU4ZS4uYjUxMWQ3OTJjZjlkNDk1 NWEyNzllMzQzNjMyY2Q0ZDg3NDNiZDRiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1enpGYWNlLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1enpGYWNlLmgKQEAgLTM2LDYgKzM2 LDggQEAKICNpbmNsdWRlIDxtZW1vcnk+CiAjaW5jbHVkZSA8d3RmL0Zhc3RNYWxsb2MuaD4KICNp bmNsdWRlIDx3dGYvSGFzaE1hcC5oPgorI2luY2x1ZGUgPHd0Zi9SZWYuaD4KKyNpbmNsdWRlIDx3 dGYvUmVmQ291bnRlZC5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTU2LDEyICs1OCwz NCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRTY3JpcHRGb3JWZXJ0aWNhbEdseXBoU3Vic3RpdHV0 aW9uKGhiX2J1ZmZlcl90Kik7CiAKIHByaXZhdGU6CisgICAgY2xhc3MgQ2FjaGVFbnRyeSA6IHB1 YmxpYyBSZWZDb3VudGVkPENhY2hlRW50cnk+IHsKKyAgICBwdWJsaWM6CisgICAgICAgIHVzaW5n IEdseXBoQ2FjaGUgPSBIYXNoTWFwPHVpbnQzMl90LCB1aW50MTZfdD47CisKKyAgICAgICAgc3Rh dGljIFJlZjxDYWNoZUVudHJ5PiBjcmVhdGUoaGJfZmFjZV90KiBmYWNlKQorICAgICAgICB7Cisg ICAgICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBDYWNoZUVudHJ5KGZhY2UpKTsKKyAgICAg ICAgfQorICAgICAgICB+Q2FjaGVFbnRyeSgpOworCisgICAgICAgIGhiX2ZhY2VfdCogZmFjZSgp IHsgcmV0dXJuIG1fZmFjZTsgfQorICAgICAgICBHbHlwaENhY2hlJiBnbHlwaENhY2hlKCkgeyBy ZXR1cm4gbV9nbHlwaENhY2hlOyB9CisKKyAgICBwcml2YXRlOgorICAgICAgICBDYWNoZUVudHJ5 KGhiX2ZhY2VfdCopOworCisgICAgICAgIGhiX2ZhY2VfdCogbV9mYWNlOworICAgICAgICBHbHlw aENhY2hlIG1fZ2x5cGhDYWNoZTsKKyAgICB9OworCisgICAgdXNpbmcgQ2FjaGUgPSBIYXNoTWFw PHVpbnQ2NF90LCBSZWZQdHI8Q2FjaGVFbnRyeT4sIFdURjo6SW50SGFzaDx1aW50NjRfdD4sIFdU Rjo6VW5zaWduZWRXaXRoWmVyb0tleUhhc2hUcmFpdHM8dWludDY0X3Q+PjsKKyAgICBzdGF0aWMg Q2FjaGUmIGNhY2hlKCk7CisKICAgICBoYl9mYWNlX3QqIGNyZWF0ZUZhY2UoKTsKIAogICAgIEZv bnRQbGF0Zm9ybURhdGEqIG1fcGxhdGZvcm1EYXRhOwogICAgIHVpbnQ2NF90IG1fdW5pcXVlSUQ7 Ci0gICAgaGJfZmFjZV90KiBtX2ZhY2U7Ci0gICAgV1RGOjpIYXNoTWFwPHVpbnQzMl90LCB1aW50 MTZfdD4qIG1fZ2x5cGhDYWNoZUZvckZhY2VDYWNoZUVudHJ5OworICAgIFJlZlB0cjxDYWNoZUVu dHJ5PiBtX2NhY2hlRW50cnk7CiAKICAgICBoYl9zY3JpcHRfdCBtX3NjcmlwdEZvclZlcnRpY2Fs VGV4dDsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9o YXJmYnV6ei9IYXJmQnV6ekZhY2VDYWlyby5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6ekZhY2VDYWlyby5jcHAKaW5kZXggMWUxZGU0YTczZTQ1 OThmYjg0NzdhM2M0M2U3NTI3NmM0MWJkMzc2Mi4uNDMyMzMyZjAyNjFlMTQ4ZDE0N2U3YjE4MTU1 ZjRkZTk4ZjMwMTZjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvaGFyZmJ1enovSGFyZkJ1enpGYWNlQ2Fpcm8uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6RmFjZUNhaXJvLmNwcApAQCAtNTAsNyAr NTAsNyBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBzdHJ1Y3QgSGFyZkJ1enpGb250RGF0YSB7 Ci0gICAgV1RGOjpIYXNoTWFwPHVpbnQzMl90LCB1aW50MTZfdD4qIGdseXBoQ2FjaGVGb3JGYWNl Q2FjaGVFbnRyeTsKKyAgICBXVEY6Okhhc2hNYXA8dWludDMyX3QsIHVpbnQxNl90PiYgZ2x5cGhD YWNoZUZvckZhY2VDYWNoZUVudHJ5OwogICAgIFJlZlB0cjxjYWlyb19zY2FsZWRfZm9udF90PiBj YWlyb1NjYWxlZEZvbnQ7CiB9OwogCkBAIC05MSw3ICs5MSw3IEBAIHN0YXRpYyBoYl9ib29sX3Qg aGFyZkJ1enpHZXRHbHlwaChoYl9mb250X3QqLCB2b2lkKiBmb250RGF0YSwgaGJfY29kZXBvaW50 X3QgdW5pCiAgICAgYXV0byogc2NhbGVkRm9udCA9IGhiRm9udERhdGEuY2Fpcm9TY2FsZWRGb250 LmdldCgpOwogICAgIEFTU0VSVChzY2FsZWRGb250KTsKIAotICAgIFdURjo6SGFzaE1hcDx1aW50 MzJfdCwgdWludDE2X3Q+OjpBZGRSZXN1bHQgcmVzdWx0ID0gaGJGb250RGF0YS5nbHlwaENhY2hl Rm9yRmFjZUNhY2hlRW50cnktPmFkZCh1bmljb2RlLCAwKTsKKyAgICBhdXRvIHJlc3VsdCA9IGhi Rm9udERhdGEuZ2x5cGhDYWNoZUZvckZhY2VDYWNoZUVudHJ5LmFkZCh1bmljb2RlLCAwKTsKICAg ICBpZiAocmVzdWx0LmlzTmV3RW50cnkpIHsKICAgICAgICAgY2Fpcm9fZ2x5cGhfdCogZ2x5cGhz ID0gMDsKICAgICAgICAgaW50IG51bUdseXBocyA9IDA7CkBAIC0yMDEsOCArMjAxLDggQEAgaGJf ZmFjZV90KiBIYXJmQnV6ekZhY2U6OmNyZWF0ZUZhY2UoKQogCiBoYl9mb250X3QqIEhhcmZCdXp6 RmFjZTo6Y3JlYXRlRm9udCgpCiB7Ci0gICAgaGJfZm9udF90KiBmb250ID0gaGJfZm9udF9jcmVh dGUobV9mYWNlKTsKLSAgICBoYl9mb250X3NldF9mdW5jcyhmb250LCBoYXJmQnV6ekNhaXJvVGV4 dEdldEZvbnRGdW5jcygpLCBuZXcgSGFyZkJ1enpGb250RGF0YSB7IG1fZ2x5cGhDYWNoZUZvckZh Y2VDYWNoZUVudHJ5LCBtX3BsYXRmb3JtRGF0YS0+c2NhbGVkRm9udCgpIH0sCisgICAgaGJfZm9u dF90KiBmb250ID0gaGJfZm9udF9jcmVhdGUobV9jYWNoZUVudHJ5LT5mYWNlKCkpOworICAgIGhi X2ZvbnRfc2V0X2Z1bmNzKGZvbnQsIGhhcmZCdXp6Q2Fpcm9UZXh0R2V0Rm9udEZ1bmNzKCksIG5l dyBIYXJmQnV6ekZvbnREYXRhIHsgbV9jYWNoZUVudHJ5LT5nbHlwaENhY2hlKCksIG1fcGxhdGZv cm1EYXRhLT5zY2FsZWRGb250KCkgfSwKICAgICAgICAgW10odm9pZCogZGF0YSkKICAgICAgICAg ewogICAgICAgICAgICAgZGVsZXRlIHN0YXRpY19jYXN0PEhhcmZCdXp6Rm9udERhdGEqPihkYXRh KTsK