138891 2014-11-19 15:30:45 -0800 [OS X] Upright vertical text is completely broken for multi-code-unit code points 2015-04-27 18:13:12 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 144303 1 mmaxfield mmaxfield dino jonlee mitz simon.fraser thorton webkit-bug-importer oldest_to_newest 1049941 0 mmaxfield 2014-11-19 15:30:45 -0800 Upright vertical text is completely broken for multi-code-unit codepoints 1049951 1 241899 mmaxfield 2014-11-19 15:49:01 -0800 Created attachment 241899 Patch 1049953 2 mmaxfield 2014-11-19 15:49:32 -0800 <rdar://problem/18421386> 1049973 3 241899 mitz 2014-11-19 16:07:47 -0800 Comment on attachment 241899 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=241899&action=review > Source/WebCore/platform/graphics/mac/GlyphPageTreeNodeMac.cpp:153 > - setGlyphDataForIndex(offset + stringIndices[i], glyphs[i], fontData); > + // Because of the size of the GlyphPage, the string will never straddle a code-unit size boundary > + unsigned index = U16_IS_LEAD(buffer[stringIndices[i]]) ? stringIndices[i] / 2 : stringIndices[i]; > + setGlyphDataForIndex(offset + index, glyphs[i], fontData); Shouldn’t you make this change in the else block below as well? It’s weird to write the logic this way, because we are relying on the fact that buffer is either uniformly BMP characters or surrogate pairs. It wouldn’t work otherwise. I think that instead you should use the glyphStep approach we use above. 1049981 4 241905 mmaxfield 2014-11-19 16:26:08 -0800 Created attachment 241905 Patch 1050009 5 mmaxfield 2014-11-19 17:35:47 -0800 http://trac.webkit.org/changeset/176372 241899 2014-11-19 15:49:01 -0800 2014-11-19 16:26:05 -0800 Patch bug-138891-20141119154917.patch text/plain 6431 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2MzQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzNlOWVhY2E5ZTlhZmQ4 MDA4MDhlOWYwNjlhMzEzODAxMTExYzVlNS4uODgxZjc2YTcyMzI2OTRhZWRjZTBmYTBjNDMzYmYw ZmVjMmZlMzhmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE0LTExLTE5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW09TIFhdIFVw cmlnaHQgdmVydGljYWwgdGV4dCBpcyBjb21wbGV0ZWx5IGJyb2tlbiBmb3IgbXVsdGktY29kZS11 bml0IGNvZGVwb2ludHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzODg5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdlIHdlcmUgYXNzdW1pbmcgdGhhdCB3ZSBjYW4gdXNlIHRoZSBzdHJpbmcgaW5kZXgg KGluIFVURi0xNikgYXMgdGhlIGdseXBoCisgICAgICAgIGluZGV4LiBUaGlzIGZhbGxzIGRvd24g d2hlbiBhIHNpbmdsZSBjb2RlcG9pbnQgKGFuZCBnbHlwaCkgY29udGlhbnMKKyAgICAgICAgbXVs dGlwbGUgY29kZSB1bml0cy4KKworICAgICAgICBUZXN0OiBwbGF0Zm9ybS9tYWMvZmFzdC90ZXh0 L211bHRpcGxlLWNvZGV1bml0LXZlcnRpY2FsLXVwcmlnaHQuaHRtbAorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvR2x5cGhQYWdlLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv bWFjL0dseXBoUGFnZVRyZWVOb2RlTWFjLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdseXBoUGFn ZTo6ZmlsbCk6CisKIDIwMTQtMTEtMTkgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29t PgogCiAgICAgICAgIEZpeCBUaWxlc0FkZGVkIGJpdG1hc2sKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dseXBoUGFnZS5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR2x5cGhQYWdlLmgKaW5kZXggZTczNWUzYTIxNjllZTY1ZWRiZTU5NjJk YTVlMTdjYTY4ZTY5YjlhNS4uNTJhNWUzMDliM2M4ODc5MTNiMWNmMjFmODc1Njg5ZWNjN2RkM2Ez YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhQYWdl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhQYWdlLmgKQEAg LTk4LDYgKzk4LDcgQEAgcHVibGljOgogICAgIH5HbHlwaFBhZ2UoKSB7IH0KIAogICAgIHN0YXRp YyBjb25zdCBzaXplX3Qgc2l6ZSA9IDI1NjsgLy8gQ292ZXJzIExhdGluLTEgaW4gYSBzaW5nbGUg cGFnZS4KKyAgICBzdGF0aWNfYXNzZXJ0KCghKDB4RDgwMCAlIHNpemUpKSAmJiAoISgweERDMDAg JSBzaXplKSkgJiYgKCEoMHhFMDAwICUgc2l6ZSkpLCAiR2x5cGhQYWdlcyBtdXN0IG5ldmVyIHN0 cmFkZGxlIGNvZGUtdW5pdCBsZW5ndGggYm91bmRhcmllcyIpOwogICAgIHN0YXRpYyB1bnNpZ25l ZCBpbmRleEZvckNoYXJhY3RlcihVQ2hhcjMyIGMpIHsgcmV0dXJuIGMgJSBHbHlwaFBhZ2U6OnNp emU7IH0KIAogICAgIEFMV0FZU19JTkxJTkUgR2x5cGhEYXRhIGdseXBoRGF0YUZvckNoYXJhY3Rl cihVQ2hhcjMyIGMpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9tYWMvR2x5cGhQYWdlVHJlZU5vZGVNYWMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvbWFjL0dseXBoUGFnZVRyZWVOb2RlTWFjLmNwcAppbmRleCBhYzUzMWZj NzVjZWQ1ZTc5NGMyZWFjMmNlNTFmYThiMWQ4ZjNjOTg2Li43NDlmMGIxMjRiMzk5NTQ2OGIyMjI5 MTU5YTBmYmEyMTg1N2I4OGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9tYWMvR2x5cGhQYWdlVHJlZU5vZGVNYWMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL21hYy9HbHlwaFBhZ2VUcmVlTm9kZU1hYy5jcHAKQEAgLTE0OCw3 ICsxNDgsOSBAQCBib29sIEdseXBoUGFnZTo6ZmlsbCh1bnNpZ25lZCBvZmZzZXQsIHVuc2lnbmVk IGxlbmd0aCwgVUNoYXIqIGJ1ZmZlciwgdW5zaWduZWQgYgogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAg ICAgICAgICAgaWYgKGdseXBoc1tpXSkgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNl dEdseXBoRGF0YUZvckluZGV4KG9mZnNldCArIHN0cmluZ0luZGljZXNbaV0sIGdseXBoc1tpXSwg Zm9udERhdGEpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIEJlY2F1c2Ugb2YgdGhl IHNpemUgb2YgdGhlIEdseXBoUGFnZSwgdGhlIHN0cmluZyB3aWxsIG5ldmVyIHN0cmFkZGxlIGEg Y29kZS11bml0IHNpemUgYm91bmRhcnkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNp Z25lZCBpbmRleCA9IFUxNl9JU19MRUFEKGJ1ZmZlcltzdHJpbmdJbmRpY2VzW2ldXSkgPyBzdHJp bmdJbmRpY2VzW2ldIC8gMiA6IHN0cmluZ0luZGljZXNbaV07CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgc2V0R2x5cGhEYXRhRm9ySW5kZXgob2Zmc2V0ICsgaW5kZXgsIGdseXBoc1tpXSwg Zm9udERhdGEpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhhdmVHbHlwaHMgPSB0cnVl OwogICAgICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICB9CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k ZXggNjg5ZGQ0YTNiOTdjYjJhOTUyMzk4NDRmNDVjYTQzNGI4MTk4MDA1ZS4uNThkMDU5NzRkYTFj YjRlY2Q5ZDJkNmU4YTc0M2I0NmJiNGEyYWFlZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0 LTExLTE5ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAg ICAgW09TIFhdIFVwcmlnaHQgdmVydGljYWwgdGV4dCBpcyBjb21wbGV0ZWx5IGJyb2tlbiBmb3Ig bXVsdGktY29kZS11bml0IGNvZGVwb2ludHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzODg5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE1ha2Ugc3VyZSBhIHNpbmdsZSB1cHJpZ2h0IHZlcnRpY2FsIG11 bHRpLWNvZGUtdW5pdCBjb2RlcG9pbnQgaXMgcmVuZGVyZWQgdGhlIHNhbWUgYXMKKyAgICAgICAg dGhlIHNhbWUgY29kZXBvaW50IHJlbmRlcmVkIGhvcml6b250YWxseS4KKworICAgICAgICAqIHBs YXRmb3JtL21hYy9mYXN0L3RleHQvbXVsdGlwbGUtY29kZXVuaXQtdmVydGljYWwtdXByaWdodC1l eHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvZmFzdC90ZXh0L211 bHRpcGxlLWNvZGV1bml0LXZlcnRpY2FsLXVwcmlnaHQuaHRtbDogQWRkZWQuCisgICAgICAgICog cGxhdGZvcm0vbWFjL2Zhc3QvdGV4dC9yZXNvdXJjZXMvbXVsdGlwbGUtY29kZXVuaXQtdmVydGlj YWwtdXByaWdodC5vdGY6IEFkZGVkLgorCiAyMDE0LTExLTE5ICBDaHJpcyBEdW1leiAgPGNkdW1l ekBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGxheW91dCB0ZXN0IGZvciB0aHJvdHRsaW5nIG9m IERPTSB0aW1lciBjaGFuZ2luZyB0aGUgc3R5bGUgb2YgdmlzaWJsZSBhbmQgaW52aXNpYmxlIGVs ZW1lbnRzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC90ZXh0L211 bHRpcGxlLWNvZGV1bml0LXZlcnRpY2FsLXVwcmlnaHQtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRl c3RzL3BsYXRmb3JtL21hYy9mYXN0L3RleHQvbXVsdGlwbGUtY29kZXVuaXQtdmVydGljYWwtdXBy aWdodC1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjk2N2ViOTY3NWM1OWEzY2Q1N2Y5ODhiZTNj NmYxNzllNTk4YWFmNDYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvZmFzdC90ZXh0L211bHRpcGxlLWNvZGV1bml0LXZlcnRpY2FsLXVwcmlnaHQtZXhwZWN0ZWQu aHRtbApAQCAtMCwwICsxLDE0IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8 c3R5bGU+CitAZm9udC1mYWNlIHsKKyAgICBmb250LWZhbWlseTogIkxpdGhlcnVtIjsKKyAgICBz cmM6IHVybCgicmVzb3VyY2VzL211bHRpcGxlLWNvZGV1bml0LXZlcnRpY2FsLXVwcmlnaHQub3Rm IikgZm9ybWF0KCJvcGVudHlwZSIpOworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5IHN0eWxl PSItd2Via2l0LWZvbnQtc21vb3RoaW5nOiBub25lOyI+Cis8ZGl2IHN0eWxlPSJmb250OiA5NnB4 IExpdGhlcnVtOyBwb3NpdGlvbjogcmVsYXRpdmU7IGxlZnQ6IDMuNXB4OyB0b3A6IDFweDsiPiYj eDIwMDBiOzwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv cGxhdGZvcm0vbWFjL2Zhc3QvdGV4dC9tdWx0aXBsZS1jb2RldW5pdC12ZXJ0aWNhbC11cHJpZ2h0 Lmh0bWwgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC90ZXh0L211bHRpcGxlLWNvZGV1 bml0LXZlcnRpY2FsLXVwcmlnaHQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zOTY5YWIxNWY0YmI1NDg1M2I4 MmFhMDA5NDBmNGZiNmE3Y2Q0ZGE4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjL2Zhc3QvdGV4dC9tdWx0aXBsZS1jb2RldW5pdC12ZXJ0aWNhbC11cHJpZ2h0Lmh0 bWwKQEAgLTAsMCArMSwxNCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHN0 eWxlPgorQGZvbnQtZmFjZSB7CisgICAgZm9udC1mYW1pbHk6ICJMaXRoZXJ1bSI7CisgICAgc3Jj OiB1cmwoInJlc291cmNlcy9tdWx0aXBsZS1jb2RldW5pdC12ZXJ0aWNhbC11cHJpZ2h0Lm90ZiIp IGZvcm1hdCgib3BlbnR5cGUiKTsKK30KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keSBzdHlsZT0i LXdlYmtpdC1mb250LXNtb290aGluZzogbm9uZTsiPgorPGRpdiBzdHlsZT0iZm9udDogOTZweCBM aXRoZXJ1bTsgLXdlYmtpdC13cml0aW5nLW1vZGU6IHZlcnRpY2FsLXJsOyAtd2Via2l0LXRleHQt b3JpZW50YXRpb246IHVwcmlnaHQ7Ij4mI3gyMDAwYjs8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L3RleHQvcmVzb3VyY2Vz L211bHRpcGxlLWNvZGV1bml0LXZlcnRpY2FsLXVwcmlnaHQub3RmIGIvTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjL2Zhc3QvdGV4dC9yZXNvdXJjZXMvbXVsdGlwbGUtY29kZXVuaXQtdmVydGljYWwt dXByaWdodC5vdGYKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZGY2OGVhYzVlYjJjNTBjZWY5YTQ5ZTUzMDNlN2FlMjhm M2ZiZTJlNApHSVQgYmluYXJ5IHBhdGNoCmxpdGVyYWwgOTkyCnpjbWI3REY7NWdoNiNpeXptdDJt XjliQUcmakxDKnZFKjNAekEldmlmaGs/VDRSMkQ4VkIobG9FWkQ1YmZhVXFtKwp6X1F0fX0oISRj LV9JYGlgUCtDKUJXNU12Zm5PIS0+IyttRyFAMClxPSV7T21tOCk0VyQzQ0dBYGI3XkB3U2lKTjgK ejQ4Uz9SWiE0PjdeKT1rUjRYN3tWcEJ0O3d2KEs5d2J3RyNZUHVDa1NTR1khfktob3NpQ1E8aFYj KU47T25RT1BBCnp0QDlebTUmM3VXYDhGcFc2e2E8aUUwUn4rTiZrcHJvX3QyZS1CenpOajxPK05B Zz85U1FDR3ZlQjtPPHRJI0pTNgp6eEo4JmRybTF4STVCa0t5S2hPayslPG9rV0I7UXhePkxLJE5N e05FUl4xT29RTDN4Q3RTeldgMl9la0dxWWpkPUsKem1fZGZyZyljQkhpKjFmeSQ0TUlJKE9KcTA9 X0AwUVhHcU9OPkY8ZjVIMyF1TjsyUjltMnRvPElXUX19ZFNQOUdoCnpsOU9GUDczKXdARk03azEk eklaJjA/bEgwK2lAcXRXWVhHLTV5WUxpazZMZHAtb1hRVVMtbztfaStLLTNqNmVZdQp6T2t5Z1g1 N0lIP1JhO18oOFo8YElFZE42NF9vflM4KzVmd1ImKzFKSEdSQTZmQHVGNVB4eVVaPHpPe1QqPkY1 VEgKelFPPUIjV2FxPD1ySCN8cTw7T3BAejRKZjM5VGBhRlpFblo4bGF7cEdRY2t8WCFIXjIpVlhy elp5NmopRjk7fU1fCndXdG4ob090N29ESGZnKHwqP0d2amtyVFQ2OENFM2dIPTd6YEJLe1dDc2FY XjEkcyNqZj5YZmRGU01geC1pdlIhcwoKbGl0ZXJhbCAwCkhjbVY/ZDAwMDAxCgo= 241905 2014-11-19 16:26:08 -0800 2014-11-19 16:45:04 -0800 Patch bug-138891-20141119162624.patch text/plain 8660 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2MzQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzNlOWVhY2E5ZTlhZmQ4 MDA4MDhlOWYwNjlhMzEzODAxMTExYzVlNS4uODgxZjc2YTcyMzI2OTRhZWRjZTBmYTBjNDMzYmYw ZmVjMmZlMzhmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE0LTExLTE5ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW09TIFhdIFVw cmlnaHQgdmVydGljYWwgdGV4dCBpcyBjb21wbGV0ZWx5IGJyb2tlbiBmb3IgbXVsdGktY29kZS11 bml0IGNvZGVwb2ludHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzODg5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdlIHdlcmUgYXNzdW1pbmcgdGhhdCB3ZSBjYW4gdXNlIHRoZSBzdHJpbmcgaW5kZXgg KGluIFVURi0xNikgYXMgdGhlIGdseXBoCisgICAgICAgIGluZGV4LiBUaGlzIGZhbGxzIGRvd24g d2hlbiBhIHNpbmdsZSBjb2RlcG9pbnQgKGFuZCBnbHlwaCkgY29udGlhbnMKKyAgICAgICAgbXVs dGlwbGUgY29kZSB1bml0cy4KKworICAgICAgICBUZXN0OiBwbGF0Zm9ybS9tYWMvZmFzdC90ZXh0 L211bHRpcGxlLWNvZGV1bml0LXZlcnRpY2FsLXVwcmlnaHQuaHRtbAorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvR2x5cGhQYWdlLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv bWFjL0dseXBoUGFnZVRyZWVOb2RlTWFjLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdseXBoUGFn ZTo6ZmlsbCk6CisKIDIwMTQtMTEtMTkgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29t PgogCiAgICAgICAgIEZpeCBUaWxlc0FkZGVkIGJpdG1hc2sKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dseXBoUGFnZS5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR2x5cGhQYWdlLmgKaW5kZXggZTczNWUzYTIxNjllZTY1ZWRiZTU5NjJk YTVlMTdjYTY4ZTY5YjlhNS4uNTJhNWUzMDliM2M4ODc5MTNiMWNmMjFmODc1Njg5ZWNjN2RkM2Ez YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhQYWdl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5cGhQYWdlLmgKQEAg LTk4LDYgKzk4LDcgQEAgcHVibGljOgogICAgIH5HbHlwaFBhZ2UoKSB7IH0KIAogICAgIHN0YXRp YyBjb25zdCBzaXplX3Qgc2l6ZSA9IDI1NjsgLy8gQ292ZXJzIExhdGluLTEgaW4gYSBzaW5nbGUg cGFnZS4KKyAgICBzdGF0aWNfYXNzZXJ0KCghKDB4RDgwMCAlIHNpemUpKSAmJiAoISgweERDMDAg JSBzaXplKSkgJiYgKCEoMHhFMDAwICUgc2l6ZSkpLCAiR2x5cGhQYWdlcyBtdXN0IG5ldmVyIHN0 cmFkZGxlIGNvZGUtdW5pdCBsZW5ndGggYm91bmRhcmllcyIpOwogICAgIHN0YXRpYyB1bnNpZ25l ZCBpbmRleEZvckNoYXJhY3RlcihVQ2hhcjMyIGMpIHsgcmV0dXJuIGMgJSBHbHlwaFBhZ2U6OnNp emU7IH0KIAogICAgIEFMV0FZU19JTkxJTkUgR2x5cGhEYXRhIGdseXBoRGF0YUZvckNoYXJhY3Rl cihVQ2hhcjMyIGMpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9tYWMvR2x5cGhQYWdlVHJlZU5vZGVNYWMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvbWFjL0dseXBoUGFnZVRyZWVOb2RlTWFjLmNwcAppbmRleCBhYzUzMWZj NzVjZWQ1ZTc5NGMyZWFjMmNlNTFmYThiMWQ4ZjNjOTg2Li4zZTk5NjJiN2UzMGJhOGRkOWUwZGZj ZjliMDE2YTRlNzIwNGJiOWJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9tYWMvR2x5cGhQYWdlVHJlZU5vZGVNYWMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL21hYy9HbHlwaFBhZ2VUcmVlTm9kZU1hYy5jcHAKQEAgLTg0LDYg Kzg0LDcgQEAgYm9vbCBHbHlwaFBhZ2U6OmZpbGwodW5zaWduZWQgb2Zmc2V0LCB1bnNpZ25lZCBs ZW5ndGgsIFVDaGFyKiBidWZmZXIsIHVuc2lnbmVkIGIKICAgICAgICAgICAgICAgIDogQ1RGb250 R2V0R2x5cGhzRm9yQ2hhcmFjdGVycyhmb250RGF0YS0+cGxhdGZvcm1EYXRhKCkuY3RGb250KCks IGJ1ZmZlciwgZ2x5cGhzLmRhdGEoKSwgYnVmZmVyTGVuZ3RoKSkpIHsKICAgICAgICAgLy8gV2hl biBidWZmZXIgY29uc2lzdHMgb2Ygc3Vycm9nYXRlIHBhaXJzLCBDVEZvbnRHZXRWZXJ0aWNhbEds eXBoc0ZvckNoYXJhY3RlcnMgYW5kIENURm9udEdldEdseXBoc0ZvckNoYXJhY3RlcnMKICAgICAg ICAgLy8gcGxhY2UgdGhlIGdseXBocyBhdCBpbmRpY2VzIGNvcnJlc3BvbmRpbmcgdG8gdGhlIGZp cnN0IGNoYXJhY3RlciBvZiBlYWNoIHBhaXIuCisgICAgICAgIEFTU0VSVCghKGJ1ZmZlckxlbmd0 aCAlIGxlbmd0aCkgJiYgKGJ1ZmZlckxlbmd0aCAvIGxlbmd0aCA9PSAxIHx8IGJ1ZmZlckxlbmd0 aCAvIGxlbmd0aCA9PSAyKSk7CiAgICAgICAgIHVuc2lnbmVkIGdseXBoU3RlcCA9IGJ1ZmZlckxl bmd0aCAvIGxlbmd0aDsKICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0aDsg KytpKSB7CiAgICAgICAgICAgICBpZiAoIWdseXBoc1tpICogZ2x5cGhTdGVwXSkKQEAgLTE0MSwx NCArMTQyLDE4IEBAIGJvb2wgR2x5cGhQYWdlOjpmaWxsKHVuc2lnbmVkIG9mZnNldCwgdW5zaWdu ZWQgbGVuZ3RoLCBVQ2hhciogYnVmZmVyLCB1bnNpZ25lZCBiCiAgICAgICAgICAgICAgICAgICAg IHN0cmluZ0luZGljZXMgPSBpbmRleFZlY3Rvci5kYXRhKCk7CiAgICAgICAgICAgICAgICAgfQog CisgICAgICAgICAgICAgICAgLy8gV2hlbiBidWZmZXIgY29uc2lzdHMgb2Ygc3Vycm9nYXRlIHBh aXJzLCBDVFJ1bkdldFN0cmluZ0luZGljZXNQdHIgYW5kIENUUnVuR2V0U3RyaW5nSW5kaWNlcwor ICAgICAgICAgICAgICAgIC8vIHBsYWNlIHRoZSBnbHlwaHMgYXQgaW5kaWNlcyBjb3JyZXNwb25k aW5nIHRvIHRoZSBmaXJzdCBjaGFyYWN0ZXIgb2YgZWFjaCBwYWlyLgorICAgICAgICAgICAgICAg IEFTU0VSVCghKGJ1ZmZlckxlbmd0aCAlIGxlbmd0aCkgJiYgKGJ1ZmZlckxlbmd0aCAvIGxlbmd0 aCA9PSAxIHx8IGJ1ZmZlckxlbmd0aCAvIGxlbmd0aCA9PSAyKSk7CisgICAgICAgICAgICAgICAg dW5zaWduZWQgZ2x5cGhTdGVwID0gYnVmZmVyTGVuZ3RoIC8gbGVuZ3RoOwogICAgICAgICAgICAg ICAgIGlmIChnb3RCYXNlRm9udCkgewogICAgICAgICAgICAgICAgICAgICBmb3IgKENGSW5kZXgg aSA9IDA7IGkgPCBnbHlwaENvdW50OyArK2kpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlm IChzdHJpbmdJbmRpY2VzW2ldID49IHN0YXRpY19jYXN0PENGSW5kZXg+KGxlbmd0aCkpIHsKKyAg ICAgICAgICAgICAgICAgICAgICAgIGlmIChzdHJpbmdJbmRpY2VzW2ldID49IHN0YXRpY19jYXN0 PENGSW5kZXg+KGJ1ZmZlckxlbmd0aCkpIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBk b25lID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAg ICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChnbHlwaHNbaV0p IHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZXRHbHlwaERhdGFGb3JJbmRleChvZmZz ZXQgKyBzdHJpbmdJbmRpY2VzW2ldLCBnbHlwaHNbaV0sIGZvbnREYXRhKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzZXRHbHlwaERhdGFGb3JJbmRleChvZmZzZXQgKyAoc3RyaW5nSW5k aWNlc1tpXSAvIGdseXBoU3RlcCksIGdseXBoc1tpXSwgZm9udERhdGEpOwogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGhhdmVHbHlwaHMgPSB0cnVlOwogICAgICAgICAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgICAgICAgICB9CkBAIC0xNTcsMTIgKzE2MiwxMiBAQCBib29sIEds eXBoUGFnZTo6ZmlsbCh1bnNpZ25lZCBvZmZzZXQsIHVuc2lnbmVkIGxlbmd0aCwgVUNoYXIqIGJ1 ZmZlciwgdW5zaWduZWQgYgogICAgICAgICAgICAgICAgICAgICBjb25zdCBTaW1wbGVGb250RGF0 YSogcnVuU2ltcGxlID0gZm9udERhdGEtPmdldENvbXBvc2l0ZUZvbnRSZWZlcmVuY2VGb250RGF0 YSgoTlNGb250ICopcnVuRm9udCk7CiAgICAgICAgICAgICAgICAgICAgIGlmIChydW5TaW1wbGUp IHsKICAgICAgICAgICAgICAgICAgICAgICAgIGZvciAoQ0ZJbmRleCBpID0gMDsgaSA8IGdseXBo Q291bnQ7ICsraSkgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChzdHJpbmdJbmRp Y2VzW2ldID49IHN0YXRpY19jYXN0PENGSW5kZXg+KGxlbmd0aCkpIHsKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICBpZiAoc3RyaW5nSW5kaWNlc1tpXSA+PSBzdGF0aWNfY2FzdDxDRkluZGV4 PihidWZmZXJMZW5ndGgpKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRvbmUg PSB0cnVlOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGds eXBoc1tpXSkgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZXRHbHlwaERhdGFG b3JJbmRleChvZmZzZXQgKyBzdHJpbmdJbmRpY2VzW2ldLCBnbHlwaHNbaV0sIHJ1blNpbXBsZSk7 CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNldEdseXBoRGF0YUZvckluZGV4KG9m ZnNldCArIChzdHJpbmdJbmRpY2VzW2ldIC8gZ2x5cGhTdGVwKSwgZ2x5cGhzW2ldLCBydW5TaW1w bGUpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBoYXZlR2x5cGhzID0gdHJ1ZTsK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgICAgICB9 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggNjg5ZGQ0YTNiOTdjYjJhOTUyMzk4NDRmNDVjYTQzNGI4MTk4MDA1ZS4uNThkMDU5 NzRkYTFjYjRlY2Q5ZDJkNmU4YTc0M2I0NmJiNGEyYWFlZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBA CisyMDE0LTExLTE5ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisK KyAgICAgICAgW09TIFhdIFVwcmlnaHQgdmVydGljYWwgdGV4dCBpcyBjb21wbGV0ZWx5IGJyb2tl biBmb3IgbXVsdGktY29kZS11bml0IGNvZGVwb2ludHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODg5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2Ugc3VyZSBhIHNpbmdsZSB1cHJpZ2h0IHZlcnRp Y2FsIG11bHRpLWNvZGUtdW5pdCBjb2RlcG9pbnQgaXMgcmVuZGVyZWQgdGhlIHNhbWUgYXMKKyAg ICAgICAgdGhlIHNhbWUgY29kZXBvaW50IHJlbmRlcmVkIGhvcml6b250YWxseS4KKworICAgICAg ICAqIHBsYXRmb3JtL21hYy9mYXN0L3RleHQvbXVsdGlwbGUtY29kZXVuaXQtdmVydGljYWwtdXBy aWdodC1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvZmFzdC90 ZXh0L211bHRpcGxlLWNvZGV1bml0LXZlcnRpY2FsLXVwcmlnaHQuaHRtbDogQWRkZWQuCisgICAg ICAgICogcGxhdGZvcm0vbWFjL2Zhc3QvdGV4dC9yZXNvdXJjZXMvbXVsdGlwbGUtY29kZXVuaXQt dmVydGljYWwtdXByaWdodC5vdGY6IEFkZGVkLgorCiAyMDE0LTExLTE5ICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGxheW91dCB0ZXN0IGZvciB0aHJvdHRs aW5nIG9mIERPTSB0aW1lciBjaGFuZ2luZyB0aGUgc3R5bGUgb2YgdmlzaWJsZSBhbmQgaW52aXNp YmxlIGVsZW1lbnRzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC90 ZXh0L211bHRpcGxlLWNvZGV1bml0LXZlcnRpY2FsLXVwcmlnaHQtZXhwZWN0ZWQuaHRtbCBiL0xh eW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L3RleHQvbXVsdGlwbGUtY29kZXVuaXQtdmVydGlj YWwtdXByaWdodC1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjk2N2ViOTY3NWM1OWEzY2Q1N2Y5 ODhiZTNjNmYxNzllNTk4YWFmNDYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMvZmFzdC90ZXh0L211bHRpcGxlLWNvZGV1bml0LXZlcnRpY2FsLXVwcmlnaHQtZXhw ZWN0ZWQuaHRtbApAQCAtMCwwICsxLDE0IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhl YWQ+Cis8c3R5bGU+CitAZm9udC1mYWNlIHsKKyAgICBmb250LWZhbWlseTogIkxpdGhlcnVtIjsK KyAgICBzcmM6IHVybCgicmVzb3VyY2VzL211bHRpcGxlLWNvZGV1bml0LXZlcnRpY2FsLXVwcmln aHQub3RmIikgZm9ybWF0KCJvcGVudHlwZSIpOworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5 IHN0eWxlPSItd2Via2l0LWZvbnQtc21vb3RoaW5nOiBub25lOyI+Cis8ZGl2IHN0eWxlPSJmb250 OiA5NnB4IExpdGhlcnVtOyBwb3NpdGlvbjogcmVsYXRpdmU7IGxlZnQ6IDMuNXB4OyB0b3A6IDFw eDsiPiYjeDIwMDBiOzwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvdGV4dC9tdWx0aXBsZS1jb2RldW5pdC12ZXJ0aWNhbC11 cHJpZ2h0Lmh0bWwgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC90ZXh0L211bHRpcGxl LWNvZGV1bml0LXZlcnRpY2FsLXVwcmlnaHQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zOTY5YWIxNWY0YmI1 NDg1M2I4MmFhMDA5NDBmNGZiNmE3Y2Q0ZGE4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjL2Zhc3QvdGV4dC9tdWx0aXBsZS1jb2RldW5pdC12ZXJ0aWNhbC11cHJp Z2h0Lmh0bWwKQEAgLTAsMCArMSwxNCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFk PgorPHN0eWxlPgorQGZvbnQtZmFjZSB7CisgICAgZm9udC1mYW1pbHk6ICJMaXRoZXJ1bSI7Cisg ICAgc3JjOiB1cmwoInJlc291cmNlcy9tdWx0aXBsZS1jb2RldW5pdC12ZXJ0aWNhbC11cHJpZ2h0 Lm90ZiIpIGZvcm1hdCgib3BlbnR5cGUiKTsKK30KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keSBz dHlsZT0iLXdlYmtpdC1mb250LXNtb290aGluZzogbm9uZTsiPgorPGRpdiBzdHlsZT0iZm9udDog OTZweCBMaXRoZXJ1bTsgLXdlYmtpdC13cml0aW5nLW1vZGU6IHZlcnRpY2FsLXJsOyAtd2Via2l0 LXRleHQtb3JpZW50YXRpb246IHVwcmlnaHQ7Ij4mI3gyMDAwYjs8L2Rpdj4KKzwvYm9keT4KKzwv aHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L3RleHQvcmVz b3VyY2VzL211bHRpcGxlLWNvZGV1bml0LXZlcnRpY2FsLXVwcmlnaHQub3RmIGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjL2Zhc3QvdGV4dC9yZXNvdXJjZXMvbXVsdGlwbGUtY29kZXVuaXQtdmVy dGljYWwtdXByaWdodC5vdGYKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZGY2OGVhYzVlYjJjNTBjZWY5YTQ5ZTUzMDNl N2FlMjhmM2ZiZTJlNApHSVQgYmluYXJ5IHBhdGNoCmxpdGVyYWwgOTkyCnpjbWI3REY7NWdoNiNp eXptdDJtXjliQUcmakxDKnZFKjNAekEldmlmaGs/VDRSMkQ4VkIobG9FWkQ1YmZhVXFtKwp6X1F0 fX0oISRjLV9JYGlgUCtDKUJXNU12Zm5PIS0+IyttRyFAMClxPSV7T21tOCk0VyQzQ0dBYGI3XkB3 U2lKTjgKejQ4Uz9SWiE0PjdeKT1rUjRYN3tWcEJ0O3d2KEs5d2J3RyNZUHVDa1NTR1khfktob3Np Q1E8aFYjKU47T25RT1BBCnp0QDlebTUmM3VXYDhGcFc2e2E8aUUwUn4rTiZrcHJvX3QyZS1CenpO ajxPK05BZz85U1FDR3ZlQjtPPHRJI0pTNgp6eEo4JmRybTF4STVCa0t5S2hPayslPG9rV0I7UXhe PkxLJE5Ne05FUl4xT29RTDN4Q3RTeldgMl9la0dxWWpkPUsKem1fZGZyZyljQkhpKjFmeSQ0TUlJ KE9KcTA9X0AwUVhHcU9OPkY8ZjVIMyF1TjsyUjltMnRvPElXUX19ZFNQOUdoCnpsOU9GUDczKXdA Rk03azEkeklaJjA/bEgwK2lAcXRXWVhHLTV5WUxpazZMZHAtb1hRVVMtbztfaStLLTNqNmVZdQp6 T2t5Z1g1N0lIP1JhO18oOFo8YElFZE42NF9vflM4KzVmd1ImKzFKSEdSQTZmQHVGNVB4eVVaPHpP e1QqPkY1VEgKelFPPUIjV2FxPD1ySCN8cTw7T3BAejRKZjM5VGBhRlpFblo4bGF7cEdRY2t8WCFI XjIpVlhyelp5NmopRjk7fU1fCndXdG4ob090N29ESGZnKHwqP0d2amtyVFQ2OENFM2dIPTd6YEJL e1dDc2FYXjEkcyNqZj5YZmRGU01geC1pdlIhcwoKbGl0ZXJhbCAwCkhjbVY/ZDAwMDAxCgo=