141941 2015-02-23 17:37:25 -0800 [Cocoa] Break internal reference cycle in WebCore::Font. 2015-02-24 08:46:39 -0800 1 1 1 Unclassified WebKit Text 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue kling koivisto mmaxfield oldest_to_newest 1071446 0 kling 2015-02-23 17:37:25 -0800 The Cocoa version of Font::platformCreateScaledFont() has a bug where it will return "this" for a 0pt font. This causes a reference cycle when creating a small-caps variant for a 0pt font. 1071450 1 kling 2015-02-23 17:39:19 -0800 <rdar://problem/19650570> 1071452 2 247176 kling 2015-02-23 17:39:46 -0800 Created attachment 247176 Patch 1071454 3 247178 kling 2015-02-23 17:41:22 -0800 Created attachment 247178 Patch 1071457 4 247178 mmaxfield 2015-02-23 17:43:33 -0800 Comment on attachment 247178 Patch How can we test this? 1071460 5 kling 2015-02-23 17:45:55 -0800 (In reply to comment #4) > Comment on attachment 247178 [details] > Patch > > How can we test this? I have no idea how to test this in any reliable way. 1071666 6 247178 commit-queue 2015-02-24 08:46:35 -0800 Comment on attachment 247178 Patch Clearing flags on attachment: 247178 Committed r180561: <http://trac.webkit.org/changeset/180561> 1071667 7 commit-queue 2015-02-24 08:46:39 -0800 All reviewed patches have been landed. Closing bug. 247176 2015-02-23 17:39:46 -0800 2015-02-23 17:41:22 -0800 Patch bug-141941.diff text/plain 5556 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2NTY3Y2RjLi5mMDM1MGUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTUtMDItMjMgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFtDb2NvYV0gQnJlYWsgaW50ZXJuYWwgcmVmZXJlbmNlIGN5Y2xlIGluIFdlYkNvcmU6OkZv bnQuCisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xNDE5NDE+CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8xOTY1MDU3MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGUgQ29jb2EgaW1wbGVtZW50YXRpb24gb2YgRm9udDo6cGxhdGZvcm1D cmVhdGVTY2FsZWRGb250KCkgdHJpZWQgdG8gYmUgc21hcnQgYW5kIHVzZSB0aGUgRm9udENhY2hl LgorICAgICAgICBUaGlzIGRpZG4ndCB3b3JrIG91dCB3ZWxsIHdoZW4gc2NhbGluZyBhIDBwdCBG b250LCBzaW5jZSBzY2FsaW5nIDBwdCBieSBhbnkgZmFjdG9yIHdpbGwgcmV0dXJuIDBwdC4KKwor ICAgICAgICBXZSdkIGhhdmUgYSAwcHQgZm9udCwgc2NhbGUgaXQgYnkgMC43NSB0byBnZXQgYSBz bWFsbC1jYXBzIHZhcmlhbnQsIGFuZCB0aGVuIGNhY2hlIHRoYXQgc21hbGwtY2FwcworICAgICAg ICB2YXJpYW50IChyZWFsbHkgInRoaXMiKSBpbiBGb250OjptX2Rlcml2ZWREYXRhLT5zbWFsbENh cHMuCisKKyAgICAgICAgRml4IHRoaXMgYnkgaGF2aW5nIENvY29hIEZvbnQgc2NhbGluZyBkbyBl eGFjdGx5IHdoYXQgb3RoZXIgcGxhdGZvcm1zIGRvOiBjcmVhdGUgYSBuZXcgRm9udCBldmVyeSB0 aW1lLgorICAgICAgICBUaGlzIHN0b3BzIHVzIGZyb20gYWNjdW11bGF0aW5nIHRvbnMgb2YgYWJh bmRvbmVkIEZvbnQgb2JqZWN0cyBvdmVyIHRpbWUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9Gb250LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OnZlcnRpY2FsUmlnaHRPcmll bnRhdGlvbkZvbnQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6dXByaWdodE9yaWVudGF0aW9u Rm9udCk6CisgICAgICAgIChXZWJDb3JlOjpGb250OjpzbWFsbENhcHNGb250KToKKyAgICAgICAg KFdlYkNvcmU6OkZvbnQ6OmVtcGhhc2lzTWFya0ZvbnQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9u dDo6YnJva2VuSWRlb2dyYXBoRm9udCk6CisgICAgICAgIChXZWJDb3JlOjpGb250Ojpub25TeW50 aGV0aWNJdGFsaWNGb250KTogQWRkIGFzc2VydGlvbnMgdG8gZ3VhcmQgYWdhaW5zdCByZWZlcmVu Y2UgY3ljbGVzIGluc2lkZSBhIEZvbnQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9Gb250Q29jb2EubW06CisgICAgICAgIChXZWJDb3JlOjpGb250OjpwbGF0Zm9ybUNyZWF0 ZVNjYWxlZEZvbnQpOiBBbHdheXMgY3JlYXRlIGEgbmV3IEZvbnQgd2hlbiBzY2FsaW5nIGFuIGV4 aXN0aW5nIEZvbnQgdG8gYSBkaWZmZXJlbnQgc2l6ZS4KKwogMjAxNS0wMi0xOSAgRGF2aWQgS2ls emVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbmFtZSBTT0ZUX0xJTktfRlVO Q1RJT05fe0RFQ0wsSU1QTH0oKSB0byBTT0ZUX0xJTktfRlVOQ1RJT05fe0hFQURFUixTT1VSQ0V9 KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5jcHAKaW5kZXggOGUyMTM4 YS4uNTQ5ZGE4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Rm9udC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5jcHAK QEAgLTI4Nyw2ICsyODcsNyBAQCBQYXNzUmVmUHRyPEZvbnQ+IEZvbnQ6OnZlcnRpY2FsUmlnaHRP cmllbnRhdGlvbkZvbnQoKSBjb25zdAogICAgICAgICB2ZXJ0aWNhbFJpZ2h0UGxhdGZvcm1EYXRh LnNldE9yaWVudGF0aW9uKEhvcml6b250YWwpOwogICAgICAgICBtX2Rlcml2ZWRGb250RGF0YS0+ dmVydGljYWxSaWdodE9yaWVudGF0aW9uID0gY3JlYXRlKHZlcnRpY2FsUmlnaHRQbGF0Zm9ybURh dGEsIGlzQ3VzdG9tRm9udCgpLCBmYWxzZSwgdHJ1ZSk7CiAgICAgfQorICAgIEFTU0VSVChtX2Rl cml2ZWRGb250RGF0YS0+dmVydGljYWxSaWdodE9yaWVudGF0aW9uICE9IHRoaXMpOwogICAgIHJl dHVybiBtX2Rlcml2ZWRGb250RGF0YS0+dmVydGljYWxSaWdodE9yaWVudGF0aW9uOwogfQogCkBA IC0yOTYsNiArMjk3LDcgQEAgUGFzc1JlZlB0cjxGb250PiBGb250Ojp1cHJpZ2h0T3JpZW50YXRp b25Gb250KCkgY29uc3QKICAgICAgICAgbV9kZXJpdmVkRm9udERhdGEgPSBzdGQ6Om1ha2VfdW5p cXVlPERlcml2ZWRGb250RGF0YT4oaXNDdXN0b21Gb250KCkpOwogICAgIGlmICghbV9kZXJpdmVk Rm9udERhdGEtPnVwcmlnaHRPcmllbnRhdGlvbikKICAgICAgICAgbV9kZXJpdmVkRm9udERhdGEt PnVwcmlnaHRPcmllbnRhdGlvbiA9IGNyZWF0ZShtX3BsYXRmb3JtRGF0YSwgaXNDdXN0b21Gb250 KCksIGZhbHNlLCB0cnVlKTsKKyAgICBBU1NFUlQobV9kZXJpdmVkRm9udERhdGEtPnVwcmlnaHRP cmllbnRhdGlvbiAhPSB0aGlzKTsKICAgICByZXR1cm4gbV9kZXJpdmVkRm9udERhdGEtPnVwcmln aHRPcmllbnRhdGlvbjsKIH0KIApAQCAtMzA1LDcgKzMwNyw3IEBAIFBhc3NSZWZQdHI8Rm9udD4g Rm9udDo6c21hbGxDYXBzRm9udChjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlv bikgY29uCiAgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhID0gc3RkOjptYWtlX3VuaXF1ZTxEZXJp dmVkRm9udERhdGE+KGlzQ3VzdG9tRm9udCgpKTsKICAgICBpZiAoIW1fZGVyaXZlZEZvbnREYXRh LT5zbWFsbENhcHMpCiAgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhLT5zbWFsbENhcHMgPSBjcmVh dGVTY2FsZWRGb250KGZvbnREZXNjcmlwdGlvbiwgc21hbGxDYXBzRm9udFNpemVNdWx0aXBsaWVy KTsKLQorICAgIEFTU0VSVChtX2Rlcml2ZWRGb250RGF0YS0+c21hbGxDYXBzICE9IHRoaXMpOwog ICAgIHJldHVybiBtX2Rlcml2ZWRGb250RGF0YS0+c21hbGxDYXBzOwogfQogCkBAIC0zMTUsNyAr MzE3LDcgQEAgUGFzc1JlZlB0cjxGb250PiBGb250OjplbXBoYXNpc01hcmtGb250KGNvbnN0IEZv bnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uKQogICAgICAgICBtX2Rlcml2ZWRGb250RGF0 YSA9IHN0ZDo6bWFrZV91bmlxdWU8RGVyaXZlZEZvbnREYXRhPihpc0N1c3RvbUZvbnQoKSk7CiAg ICAgaWYgKCFtX2Rlcml2ZWRGb250RGF0YS0+ZW1waGFzaXNNYXJrKQogICAgICAgICBtX2Rlcml2 ZWRGb250RGF0YS0+ZW1waGFzaXNNYXJrID0gY3JlYXRlU2NhbGVkRm9udChmb250RGVzY3JpcHRp b24sIGVtcGhhc2lzTWFya0ZvbnRTaXplTXVsdGlwbGllcik7Ci0KKyAgICBBU1NFUlQobV9kZXJp dmVkRm9udERhdGEtPmVtcGhhc2lzTWFyayAhPSB0aGlzKTsKICAgICByZXR1cm4gbV9kZXJpdmVk Rm9udERhdGEtPmVtcGhhc2lzTWFyazsKIH0KIApAQCAtMzI3LDYgKzMyOSw3IEBAIFBhc3NSZWZQ dHI8Rm9udD4gRm9udDo6YnJva2VuSWRlb2dyYXBoRm9udCgpIGNvbnN0CiAgICAgICAgIG1fZGVy aXZlZEZvbnREYXRhLT5icm9rZW5JZGVvZ3JhcGggPSBjcmVhdGUobV9wbGF0Zm9ybURhdGEsIGlz Q3VzdG9tRm9udCgpLCBmYWxzZSk7CiAgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhLT5icm9rZW5J ZGVvZ3JhcGgtPm1faXNCcm9rZW5JZGVvZ3JhcGhGYWxsYmFjayA9IHRydWU7CiAgICAgfQorICAg IEFTU0VSVChtX2Rlcml2ZWRGb250RGF0YS0+YnJva2VuSWRlb2dyYXBoICE9IHRoaXMpOwogICAg IHJldHVybiBtX2Rlcml2ZWRGb250RGF0YS0+YnJva2VuSWRlb2dyYXBoOwogfQogCkBAIC0zNDEs NiArMzQ0LDcgQEAgUGFzc1JlZlB0cjxGb250PiBGb250Ojpub25TeW50aGV0aWNJdGFsaWNGb250 KCkgY29uc3QKICNlbmRpZgogICAgICAgICBtX2Rlcml2ZWRGb250RGF0YS0+bm9uU3ludGhldGlj SXRhbGljID0gY3JlYXRlKG5vblN5bnRoZXRpY0l0YWxpY0ZvbnRQbGF0Zm9ybURhdGEsIGlzQ3Vz dG9tRm9udCgpKTsKICAgICB9CisgICAgQVNTRVJUKG1fZGVyaXZlZEZvbnREYXRhLT5ub25TeW50 aGV0aWNJdGFsaWMgIT0gdGhpcyk7CiAgICAgcmV0dXJuIG1fZGVyaXZlZEZvbnREYXRhLT5ub25T eW50aGV0aWNJdGFsaWM7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NvY29hL0ZvbnRDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NvY29hL0ZvbnRDb2NvYS5tbQppbmRleCBiMjI3MzVjLi41MDdhOTJiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q29jb2EubW0K KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENvY29hLm1t CkBAIC0zMzksNyArMzM5LDcgQEAgUGFzc1JlZlB0cjxGb250PiBGb250OjpwbGF0Zm9ybUNyZWF0 ZVNjYWxlZEZvbnQoY29uc3QgRm9udERlc2NyaXB0aW9uJiwgZmxvYXQgc2MKICAgICAgICAgc2Nh bGVkRm9udERhdGEubV9zeW50aGV0aWNCb2xkID0gKGZvbnRUcmFpdHMgJiBOU0JvbGRGb250TWFz aykgJiYgIShzY2FsZWRGb250VHJhaXRzICYgTlNCb2xkRm9udE1hc2spOwogICAgICAgICBzY2Fs ZWRGb250RGF0YS5tX3N5bnRoZXRpY09ibGlxdWUgPSAoZm9udFRyYWl0cyAmIE5TSXRhbGljRm9u dE1hc2spICYmICEoc2NhbGVkRm9udFRyYWl0cyAmIE5TSXRhbGljRm9udE1hc2spOwogCi0gICAg ICAgIHJldHVybiBGb250Q2FjaGU6OnNpbmdsZXRvbigpLmZvbnRGb3JQbGF0Zm9ybURhdGEoc2Nh bGVkRm9udERhdGEpOworICAgICAgICByZXR1cm4gRm9udDo6Y3JlYXRlKHNjYWxlZEZvbnREYXRh KTsKICAgICB9CiAgICAgRU5EX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKIApAQCAtMzYwLDcgKzM2 MCw3IEBAIFBhc3NSZWZQdHI8Rm9udD4gRm9udDo6cGxhdGZvcm1DcmVhdGVTY2FsZWRGb250KGNv bnN0IEZvbnREZXNjcmlwdGlvbiYsIGZsb2F0IHNjCiAgICAgICAgIHNjYWxlZEZvbnREYXRhLm1f c3ludGhldGljQm9sZCA9IChmb250VHJhaXRzICYga0NURm9udEJvbGRUcmFpdCkgJiYgIShzY2Fs ZWRGb250VHJhaXRzICYga0NURm9udFRyYWl0Qm9sZCk7CiAgICAgICAgIHNjYWxlZEZvbnREYXRh Lm1fc3ludGhldGljT2JsaXF1ZSA9IChmb250VHJhaXRzICYga0NURm9udEl0YWxpY1RyYWl0KSAm JiAhKHNjYWxlZEZvbnRUcmFpdHMgJiBrQ1RGb250VHJhaXRJdGFsaWMpOwogCi0gICAgICAgIHJl dHVybiBGb250Q2FjaGU6OnNpbmdsZXRvbigpLmZvbnRGb3JQbGF0Zm9ybURhdGEoc2NhbGVkRm9u dERhdGEpOworICAgICAgICByZXR1cm4gRm9udDo6Y3JlYXRlKHNjYWxlZEZvbnREYXRhKTsKICAg ICB9CiAKICAgICByZXR1cm4gbnVsbHB0cjsK 247178 2015-02-23 17:41:22 -0800 2015-02-24 08:46:35 -0800 Patch bug-141941.diff text/plain 5555 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2NTY3Y2RjLi5hMTc4NDI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTUtMDItMjMgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFtDb2NvYV0gQnJlYWsgaW50ZXJuYWwgcmVmZXJlbmNlIGN5Y2xlIGluIFdlYkNvcmU6OkZv bnQuCisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xNDE5NDE+CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8xOTY1MDU3MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGUgQ29jb2EgaW1wbGVtZW50YXRpb24gb2YgRm9udDo6cGxhdGZvcm1D cmVhdGVTY2FsZWRGb250KCkgdHJpZWQgdG8gYmUgc21hcnQgYW5kIHVzZSB0aGUgRm9udENhY2hl LgorICAgICAgICBUaGlzIGRpZG4ndCB3b3JrIG91dCB3ZWxsIHdoZW4gc2NhbGluZyBhIDBwdCBG b250LCBzaW5jZSBzY2FsaW5nIDBwdCBieSBhbnkgZmFjdG9yIHdpbGwgcmV0dXJuIDBwdC4KKwor ICAgICAgICBXZSdkIGhhdmUgYSAwcHQgZm9udCwgc2NhbGUgaXQgYnkgMC43IHRvIGdldCBhIHNt YWxsLWNhcHMgdmFyaWFudCwgYW5kIHRoZW4gY2FjaGUgdGhhdCBzbWFsbC1jYXBzCisgICAgICAg IHZhcmlhbnQgKHJlYWxseSAidGhpcyIpIGluIEZvbnQ6Om1fZGVyaXZlZERhdGEtPnNtYWxsQ2Fw cy4KKworICAgICAgICBGaXggdGhpcyBieSBoYXZpbmcgQ29jb2EgRm9udCBzY2FsaW5nIGRvIGV4 YWN0bHkgd2hhdCBvdGhlciBwbGF0Zm9ybXMgZG86IGNyZWF0ZSBhIG5ldyBGb250IGV2ZXJ5IHRp bWUuCisgICAgICAgIFRoaXMgc3RvcHMgdXMgZnJvbSBhY2N1bXVsYXRpbmcgdG9ucyBvZiBhYmFu ZG9uZWQgRm9udCBvYmplY3RzIG92ZXIgdGltZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL0ZvbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6dmVydGljYWxSaWdodE9yaWVu dGF0aW9uRm9udCk6CisgICAgICAgIChXZWJDb3JlOjpGb250Ojp1cHJpZ2h0T3JpZW50YXRpb25G b250KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OnNtYWxsQ2Fwc0ZvbnQpOgorICAgICAgICAo V2ViQ29yZTo6Rm9udDo6ZW1waGFzaXNNYXJrRm9udCk6CisgICAgICAgIChXZWJDb3JlOjpGb250 Ojpicm9rZW5JZGVvZ3JhcGhGb250KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6Om5vblN5bnRo ZXRpY0l0YWxpY0ZvbnQpOiBBZGQgYXNzZXJ0aW9ucyB0byBndWFyZCBhZ2FpbnN0IHJlZmVyZW5j ZSBjeWNsZXMgaW5zaWRlIGEgRm9udC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nv Y29hL0ZvbnRDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OnBsYXRmb3JtQ3JlYXRl U2NhbGVkRm9udCk6IEFsd2F5cyBjcmVhdGUgYSBuZXcgRm9udCB3aGVuIHNjYWxpbmcgYW4gZXhp c3RpbmcgRm9udCB0byBhIGRpZmZlcmVudCBzaXplLgorCiAyMDE1LTAyLTE5ICBEYXZpZCBLaWx6 ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIFNPRlRfTElOS19GVU5D VElPTl97REVDTCxJTVBMfSgpIHRvIFNPRlRfTElOS19GVU5DVElPTl97SEVBREVSLFNPVVJDRX0o KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcAppbmRleCA4ZTIxMzhh Li41NDlkYTg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9G b250LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmNwcApA QCAtMjg3LDYgKzI4Nyw3IEBAIFBhc3NSZWZQdHI8Rm9udD4gRm9udDo6dmVydGljYWxSaWdodE9y aWVudGF0aW9uRm9udCgpIGNvbnN0CiAgICAgICAgIHZlcnRpY2FsUmlnaHRQbGF0Zm9ybURhdGEu c2V0T3JpZW50YXRpb24oSG9yaXpvbnRhbCk7CiAgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhLT52 ZXJ0aWNhbFJpZ2h0T3JpZW50YXRpb24gPSBjcmVhdGUodmVydGljYWxSaWdodFBsYXRmb3JtRGF0 YSwgaXNDdXN0b21Gb250KCksIGZhbHNlLCB0cnVlKTsKICAgICB9CisgICAgQVNTRVJUKG1fZGVy aXZlZEZvbnREYXRhLT52ZXJ0aWNhbFJpZ2h0T3JpZW50YXRpb24gIT0gdGhpcyk7CiAgICAgcmV0 dXJuIG1fZGVyaXZlZEZvbnREYXRhLT52ZXJ0aWNhbFJpZ2h0T3JpZW50YXRpb247CiB9CiAKQEAg LTI5Niw2ICsyOTcsNyBAQCBQYXNzUmVmUHRyPEZvbnQ+IEZvbnQ6OnVwcmlnaHRPcmllbnRhdGlv bkZvbnQoKSBjb25zdAogICAgICAgICBtX2Rlcml2ZWRGb250RGF0YSA9IHN0ZDo6bWFrZV91bmlx dWU8RGVyaXZlZEZvbnREYXRhPihpc0N1c3RvbUZvbnQoKSk7CiAgICAgaWYgKCFtX2Rlcml2ZWRG b250RGF0YS0+dXByaWdodE9yaWVudGF0aW9uKQogICAgICAgICBtX2Rlcml2ZWRGb250RGF0YS0+ dXByaWdodE9yaWVudGF0aW9uID0gY3JlYXRlKG1fcGxhdGZvcm1EYXRhLCBpc0N1c3RvbUZvbnQo KSwgZmFsc2UsIHRydWUpOworICAgIEFTU0VSVChtX2Rlcml2ZWRGb250RGF0YS0+dXByaWdodE9y aWVudGF0aW9uICE9IHRoaXMpOwogICAgIHJldHVybiBtX2Rlcml2ZWRGb250RGF0YS0+dXByaWdo dE9yaWVudGF0aW9uOwogfQogCkBAIC0zMDUsNyArMzA3LDcgQEAgUGFzc1JlZlB0cjxGb250PiBG b250OjpzbWFsbENhcHNGb250KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9u KSBjb24KICAgICAgICAgbV9kZXJpdmVkRm9udERhdGEgPSBzdGQ6Om1ha2VfdW5pcXVlPERlcml2 ZWRGb250RGF0YT4oaXNDdXN0b21Gb250KCkpOwogICAgIGlmICghbV9kZXJpdmVkRm9udERhdGEt PnNtYWxsQ2FwcykKICAgICAgICAgbV9kZXJpdmVkRm9udERhdGEtPnNtYWxsQ2FwcyA9IGNyZWF0 ZVNjYWxlZEZvbnQoZm9udERlc2NyaXB0aW9uLCBzbWFsbENhcHNGb250U2l6ZU11bHRpcGxpZXIp OwotCisgICAgQVNTRVJUKG1fZGVyaXZlZEZvbnREYXRhLT5zbWFsbENhcHMgIT0gdGhpcyk7CiAg ICAgcmV0dXJuIG1fZGVyaXZlZEZvbnREYXRhLT5zbWFsbENhcHM7CiB9CiAKQEAgLTMxNSw3ICsz MTcsNyBAQCBQYXNzUmVmUHRyPEZvbnQ+IEZvbnQ6OmVtcGhhc2lzTWFya0ZvbnQoY29uc3QgRm9u dERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24pCiAgICAgICAgIG1fZGVyaXZlZEZvbnREYXRh ID0gc3RkOjptYWtlX3VuaXF1ZTxEZXJpdmVkRm9udERhdGE+KGlzQ3VzdG9tRm9udCgpKTsKICAg ICBpZiAoIW1fZGVyaXZlZEZvbnREYXRhLT5lbXBoYXNpc01hcmspCiAgICAgICAgIG1fZGVyaXZl ZEZvbnREYXRhLT5lbXBoYXNpc01hcmsgPSBjcmVhdGVTY2FsZWRGb250KGZvbnREZXNjcmlwdGlv biwgZW1waGFzaXNNYXJrRm9udFNpemVNdWx0aXBsaWVyKTsKLQorICAgIEFTU0VSVChtX2Rlcml2 ZWRGb250RGF0YS0+ZW1waGFzaXNNYXJrICE9IHRoaXMpOwogICAgIHJldHVybiBtX2Rlcml2ZWRG b250RGF0YS0+ZW1waGFzaXNNYXJrOwogfQogCkBAIC0zMjcsNiArMzI5LDcgQEAgUGFzc1JlZlB0 cjxGb250PiBGb250Ojpicm9rZW5JZGVvZ3JhcGhGb250KCkgY29uc3QKICAgICAgICAgbV9kZXJp dmVkRm9udERhdGEtPmJyb2tlbklkZW9ncmFwaCA9IGNyZWF0ZShtX3BsYXRmb3JtRGF0YSwgaXND dXN0b21Gb250KCksIGZhbHNlKTsKICAgICAgICAgbV9kZXJpdmVkRm9udERhdGEtPmJyb2tlbklk ZW9ncmFwaC0+bV9pc0Jyb2tlbklkZW9ncmFwaEZhbGxiYWNrID0gdHJ1ZTsKICAgICB9CisgICAg QVNTRVJUKG1fZGVyaXZlZEZvbnREYXRhLT5icm9rZW5JZGVvZ3JhcGggIT0gdGhpcyk7CiAgICAg cmV0dXJuIG1fZGVyaXZlZEZvbnREYXRhLT5icm9rZW5JZGVvZ3JhcGg7CiB9CiAKQEAgLTM0MSw2 ICszNDQsNyBAQCBQYXNzUmVmUHRyPEZvbnQ+IEZvbnQ6Om5vblN5bnRoZXRpY0l0YWxpY0ZvbnQo KSBjb25zdAogI2VuZGlmCiAgICAgICAgIG1fZGVyaXZlZEZvbnREYXRhLT5ub25TeW50aGV0aWNJ dGFsaWMgPSBjcmVhdGUobm9uU3ludGhldGljSXRhbGljRm9udFBsYXRmb3JtRGF0YSwgaXNDdXN0 b21Gb250KCkpOwogICAgIH0KKyAgICBBU1NFUlQobV9kZXJpdmVkRm9udERhdGEtPm5vblN5bnRo ZXRpY0l0YWxpYyAhPSB0aGlzKTsKICAgICByZXR1cm4gbV9kZXJpdmVkRm9udERhdGEtPm5vblN5 bnRoZXRpY0l0YWxpYzsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY29jb2EvRm9udENvY29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY29jb2EvRm9udENvY29hLm1tCmluZGV4IGIyMjczNWMuLjUwN2E5MmIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDb2NvYS5tbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q29jb2EubW0K QEAgLTMzOSw3ICszMzksNyBAQCBQYXNzUmVmUHRyPEZvbnQ+IEZvbnQ6OnBsYXRmb3JtQ3JlYXRl U2NhbGVkRm9udChjb25zdCBGb250RGVzY3JpcHRpb24mLCBmbG9hdCBzYwogICAgICAgICBzY2Fs ZWRGb250RGF0YS5tX3N5bnRoZXRpY0JvbGQgPSAoZm9udFRyYWl0cyAmIE5TQm9sZEZvbnRNYXNr KSAmJiAhKHNjYWxlZEZvbnRUcmFpdHMgJiBOU0JvbGRGb250TWFzayk7CiAgICAgICAgIHNjYWxl ZEZvbnREYXRhLm1fc3ludGhldGljT2JsaXF1ZSA9IChmb250VHJhaXRzICYgTlNJdGFsaWNGb250 TWFzaykgJiYgIShzY2FsZWRGb250VHJhaXRzICYgTlNJdGFsaWNGb250TWFzayk7CiAKLSAgICAg ICAgcmV0dXJuIEZvbnRDYWNoZTo6c2luZ2xldG9uKCkuZm9udEZvclBsYXRmb3JtRGF0YShzY2Fs ZWRGb250RGF0YSk7CisgICAgICAgIHJldHVybiBGb250OjpjcmVhdGUoc2NhbGVkRm9udERhdGEp OwogICAgIH0KICAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOwogCkBAIC0zNjAsNyArMzYw LDcgQEAgUGFzc1JlZlB0cjxGb250PiBGb250OjpwbGF0Zm9ybUNyZWF0ZVNjYWxlZEZvbnQoY29u c3QgRm9udERlc2NyaXB0aW9uJiwgZmxvYXQgc2MKICAgICAgICAgc2NhbGVkRm9udERhdGEubV9z eW50aGV0aWNCb2xkID0gKGZvbnRUcmFpdHMgJiBrQ1RGb250Qm9sZFRyYWl0KSAmJiAhKHNjYWxl ZEZvbnRUcmFpdHMgJiBrQ1RGb250VHJhaXRCb2xkKTsKICAgICAgICAgc2NhbGVkRm9udERhdGEu bV9zeW50aGV0aWNPYmxpcXVlID0gKGZvbnRUcmFpdHMgJiBrQ1RGb250SXRhbGljVHJhaXQpICYm ICEoc2NhbGVkRm9udFRyYWl0cyAmIGtDVEZvbnRUcmFpdEl0YWxpYyk7CiAKLSAgICAgICAgcmV0 dXJuIEZvbnRDYWNoZTo6c2luZ2xldG9uKCkuZm9udEZvclBsYXRmb3JtRGF0YShzY2FsZWRGb250 RGF0YSk7CisgICAgICAgIHJldHVybiBGb250OjpjcmVhdGUoc2NhbGVkRm9udERhdGEpOwogICAg IH0KIAogICAgIHJldHVybiBudWxscHRyOwo=