115198 2013-04-25 12:43:04 -0700 [WIN] Add WTF_USE_IMLANG_FONT_LINK2 2013-04-29 09:32:06 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 1 paroga paroga benjamin cmarcelo commit-queue oldest_to_newest 881506 0 paroga 2013-04-25 12:43:04 -0700 [WIN] Add WTF_USE_IMLANG_FONT_LINK2 881509 1 199741 paroga 2013-04-25 12:46:31 -0700 Created attachment 199741 Patch 882539 2 199741 kling 2013-04-29 06:57:29 -0700 Comment on attachment 199741 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=199741&action=review > Source/WebCore/platform/graphics/FontCache.h:60 > +#if !defined(WTF_USE_IMLANG_FONT_LINK2) && !OS(WINCE) > +#define WTF_USE_IMLANG_FONT_LINK2 1 > +#endif Should we really be defining USE()-flags outside of Platform.h? 882548 3 200006 paroga 2013-04-29 07:21:48 -0700 Created attachment 200006 Patch 882552 4 200006 kling 2013-04-29 07:31:06 -0700 Comment on attachment 200006 Patch rs=me 882642 5 200006 commit-queue 2013-04-29 09:32:05 -0700 Comment on attachment 200006 Patch Clearing flags on attachment: 200006 Committed r149293: <http://trac.webkit.org/changeset/149293> 882643 6 commit-queue 2013-04-29 09:32:06 -0700 All reviewed patches have been landed. Closing bug. 199741 2013-04-25 12:46:31 -0700 2013-04-29 07:21:43 -0700 Patch bug-115198.patch text/plain 7710 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkY2ZiNzVjLi42NjRkZWE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjUg QEAKIDIwMTMtMDQtMjUgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAK KyAgICAgICAgW1dJTl0gQWRkIFdURl9VU0VfSU1MQU5HX0ZPTlRfTElOSzIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTE5OAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0aGlzIG5ldyBkZWZpbmUg dG8gaGF2ZSBhIGNlbnRyYWwgcGxhY2UgZm9yIHN3aXRjaGluZworICAgICAgICB0aGUgSU1MYW5n Rm9udExpbmtUeXBlIGFuZCBhZG9wIGFsbCB1c2FnZXMgb2YgdGhlIHR5cGUuCisgICAgICAgIFRo aXMgbWFrZXMgdGhlIHVzYWdlIG9mIHRoZSBjb2RlIGVhc2llciBvbiBkZXNrdG9wIHBjcy4KKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oOgorICAgICAgICAoV2ViQ29y ZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvRm9udENhY2hlV2luQ0UuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Y3VycmVudEZvbnRDb250YWluc0NoYXJhY3Rlcik6CisgICAg ICAgIChXZWJDb3JlOjpjcmVhdGVNTGFuZ0ZvbnQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENh Y2hlOjpnZXRGb250RGF0YUZvckNoYXJhY3RlcnMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL3dpbmNlL1NpbXBsZUZvbnREYXRhV2luQ0UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2lt cGxlRm9udERhdGE6OmNvbnRhaW5zQ2hhcmFjdGVycyk6CisKKzIwMTMtMDQtMjUgIFBhdHJpY2sg R2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisKICAgICAgICAgW1dJTl0gR3VhcmQgY2ZI RHJvcEZvcm1hdCgpIHdpdGggVVNFKENGKSBpbnN0ZWFkIG9mIE9TKFdJTkNFKQogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE1MTk1CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmgKaW5kZXggNDU0Y2VmMi4uMjIy ZGRkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENh Y2hlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmgK QEAgLTU1LDcgKzU1LDExIEBAIGNsYXNzIE9wZW5UeXBlVmVydGljYWxEYXRhOwogY2xhc3MgU2lt cGxlRm9udERhdGE7CiAKICNpZiBQTEFURk9STShXSU4pCi0jaWYgIU9TKFdJTkNFKSB8fCBkZWZp bmVkKElNTEFOR19GT05UX0xJTkspICYmIChJTUxBTkdfRk9OVF9MSU5LID09IDIpCisjaWYgIWRl ZmluZWQoV1RGX1VTRV9JTUxBTkdfRk9OVF9MSU5LMikgJiYgIU9TKFdJTkNFKQorI2RlZmluZSBX VEZfVVNFX0lNTEFOR19GT05UX0xJTksyIDEKKyNlbmRpZgorCisjaWYgVVNFKElNTEFOR19GT05U X0xJTksyKQogdHlwZWRlZiBJTUxhbmdGb250TGluazIgSU1MYW5nRm9udExpbmtUeXBlOwogI2Vs c2UKIHR5cGVkZWYgSU1MYW5nRm9udExpbmsgSU1MYW5nRm9udExpbmtUeXBlOwpAQCAtODIsMTIg Kzg2LDEwIEBAIHB1YmxpYzoKIAogI2lmIFBMQVRGT1JNKFdJTikKICAgICBJTUxhbmdGb250TGlu a1R5cGUqIGdldEZvbnRMaW5rSW50ZXJmYWNlKCk7Ci0jaWYgT1MoV0lOQ0UpCiAgICAgc3RhdGlj IHZvaWQgY29tSW5pdGlhbGl6ZSgpOwogICAgIHN0YXRpYyB2b2lkIGNvbVVuaW5pdGlhbGl6ZSgp OwogICAgIHN0YXRpYyBJTXVsdGlMYW5ndWFnZSogZ2V0TXVsdGlMYW5ndWFnZUludGVyZmFjZSgp OwogI2VuZGlmCi0jZW5kaWYKIAogICAgIHZvaWQgZ2V0VHJhaXRzSW5GYW1pbHkoY29uc3QgQXRv bWljU3RyaW5nJiwgVmVjdG9yPHVuc2lnbmVkPiYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9Gb250Q2FjaGVXaW5DRS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9Gb250Q2FjaGVXaW5DRS5jcHAKaW5kZXgg N2I4MDIwZC4uYWQxOTczNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvd2luY2UvRm9udENhY2hlV2luQ0UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3dpbmNlL0ZvbnRDYWNoZVdpbkNFLmNwcApAQCAtNjQsOSArNjQsOSBAQCBJ TUxhbmdGb250TGlua1R5cGUqIEZvbnRDYWNoZTo6Z2V0Rm9udExpbmtJbnRlcmZhY2UoKQogICAg IHJldHVybiBsYW5nRm9udExpbms7CiB9CiAKLSNpZiBkZWZpbmVkKElNTEFOR19GT05UX0xJTksp ICYmIChJTUxBTkdfRk9OVF9MSU5LID09IDIpCi1zdGF0aWMgYm9vbCBjdXJyZW50Rm9udENvbnRh aW5zQ2hhcmFjdGVyKElNTGFuZ0ZvbnRMaW5rMiogbGFuZ0ZvbnRMaW5rLCBIREMgaGRjLCBVQ2hh ciBjaGFyYWN0ZXIpCitzdGF0aWMgYm9vbCBjdXJyZW50Rm9udENvbnRhaW5zQ2hhcmFjdGVyKElN TGFuZ0ZvbnRMaW5rVHlwZSogbGFuZ0ZvbnRMaW5rLCBIREMgaGRjLCBIRk9OVCBoZm9udCwgVUNo YXIgY2hhcmFjdGVyLCBjb25zdCB3Y2hhcl90KiBmYWNlTmFtZSkKIHsKKyNpZiBVU0UoSU1MQU5H X0ZPTlRfTElOSzIpCiAgICAgVUlOVCB1bmljb2RlUmFuZ2VzOwogICAgIGlmIChTX09LICE9IGxh bmdGb250TGluay0+R2V0Rm9udFVuaWNvZGVSYW5nZXMoaGRjLCAmdW5pY29kZVJhbmdlcywgMCkp CiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTgyLDEyICs4Miw3IEBAIHN0YXRpYyBib29sIGN1 cnJlbnRGb250Q29udGFpbnNDaGFyYWN0ZXIoSU1MYW5nRm9udExpbmsyKiBsYW5nRm9udExpbmss IEhEQyBoZGMsCiAgICAgICAgIGlmIChpLT53Y1RvID49IGNoYXJhY3RlcikKICAgICAgICAgICAg IHJldHVybiBpLT53Y0Zyb20gPD0gY2hhcmFjdGVyOwogICAgIH0KLQotICAgIHJldHVybiBmYWxz ZTsKLX0KICNlbHNlCi1zdGF0aWMgYm9vbCBjdXJyZW50Rm9udENvbnRhaW5zQ2hhcmFjdGVyKElN TGFuZ0ZvbnRMaW5rKiBsYW5nRm9udExpbmssIEhEQyBoZGMsIEhGT05UIGhmb250LCBVQ2hhciBj aGFyYWN0ZXIsIGNvbnN0IHdjaGFyX3QqIGZhY2VOYW1lKQotewogICAgIERXT1JEIGZvbnRDb2Rl UGFnZXMgPSAwLCBjaGFyQ29kZVBhZ2VzID0gMDsKICAgICBIUkVTVUxUIHJlc3VsdCA9IGxhbmdG b250TGluay0+R2V0Rm9udENvZGVQYWdlcyhoZGMsIGhmb250LCAmZm9udENvZGVQYWdlcyk7CiAg ICAgaWYgKHJlc3VsdCAhPSBTX09LKQpAQCAtOTksMjkgKzk0LDI1IEBAIHN0YXRpYyBib29sIGN1 cnJlbnRGb250Q29udGFpbnNDaGFyYWN0ZXIoSU1MYW5nRm9udExpbmsqIGxhbmdGb250TGluaywg SERDIGhkYywKICAgICBmb250Q29kZVBhZ2VzIHw9IEZvbnRQbGF0Zm9ybURhdGE6OmdldEtub3du Rm9udENvZGVQYWdlcyhmYWNlTmFtZSk7CiAgICAgaWYgKGZvbnRDb2RlUGFnZXMgJiBjaGFyQ29k ZVBhZ2VzKQogICAgICAgICByZXR1cm4gdHJ1ZTsKKyNlbmRpZgogCiAgICAgcmV0dXJuIGZhbHNl OwogfQotI2VuZGlmCiAKLSNpZiBkZWZpbmVkKElNTEFOR19GT05UX0xJTkspICYmIChJTUxBTkdf Rk9OVF9MSU5LID09IDIpCi1zdGF0aWMgSEZPTlQgY3JlYXRlTUxhbmdGb250KElNTGFuZ0ZvbnRM aW5rMiogbGFuZ0ZvbnRMaW5rLCBIREMgaGRjLCBEV09SRCBjb2RlUGFnZU1hc2ssIFVDaGFyIGNo YXJhY3RlciA9IDApCitzdGF0aWMgSEZPTlQgY3JlYXRlTUxhbmdGb250KElNTGFuZ0ZvbnRMaW5r VHlwZSogbGFuZ0ZvbnRMaW5rLCBIREMgaGRjLCBjb25zdCBGb250UGxhdGZvcm1EYXRhJiByZWZG b250LCBEV09SRCBjb2RlUGFnZU1hc2ssIFVDaGFyIGNoYXJhY3RlciA9IDApCiB7CiAgICAgSEZP TlQgbWxhbmdGb250OwotICAgIGlmIChTVUNDRUVERUQobGFuZ0ZvbnRMaW5rLT5NYXBGb250KGhk YywgY29kZVBhZ2VNYXNrLCBjaGFyYWN0ZXIsICZtbGFuZ0ZvbnQpKSkKLSAgICAgICAgcmV0dXJu IG1sYW5nRm9udDsKIAotICAgIHJldHVybiAwOwotfQorI2lmIFVTRShJTUxBTkdfRk9OVF9MSU5L MikKKyAgICBIUkVTVUxUIHJlc3VsdCA9IGxhbmdGb250TGluay0+TWFwRm9udChoZGMsIGNvZGVQ YWdlTWFzaywgY2hhcmFjdGVyLCAmbWxhbmdGb250KTsKICNlbHNlCi1zdGF0aWMgSEZPTlQgY3Jl YXRlTUxhbmdGb250KElNTGFuZ0ZvbnRMaW5rKiBsYW5nRm9udExpbmssIEhEQyBoZGMsIGNvbnN0 IEZvbnRQbGF0Zm9ybURhdGEmIHJlZkZvbnQsIERXT1JEIGNvZGVQYWdlTWFzaykKLXsKLSAgICBI Rk9OVCBtbGFuZ0ZvbnQ7Ci0gICAgTFJFU1VMVCByZXN1bHQgPSBsYW5nRm9udExpbmstPk1hcEZv bnQoaGRjLCBjb2RlUGFnZU1hc2ssIHJlZkZvbnQuaGZvbnQoKSwgJm1sYW5nRm9udCk7CisgICAg SFJFU1VMVCByZXN1bHQgPSBsYW5nRm9udExpbmstPk1hcEZvbnQoaGRjLCBjb2RlUGFnZU1hc2ss IHJlZkZvbnQuaGZvbnQoKSwgJm1sYW5nRm9udCk7CisjZW5kaWYKIAotICAgIHJldHVybiByZXN1 bHQgPT0gU19PSyA/IG1sYW5nRm9udCA6IDA7CisgICAgaWYgKFNVQ0NFRURFRChyZXN1bHQpKQor ICAgICAgICByZXR1cm4gbWxhbmdGb250OworICAgIHJldHVybiAwOwogfQotI2VuZGlmCiAKIHN0 YXRpYyBjb25zdCBWZWN0b3I8RFdPUkQsIDQ+JiBnZXRDSktDb2RlUGFnZU1hc2tzKCkKIHsKQEAg LTIzNSwxMSArMjI2LDcgQEAgUGFzc1JlZlB0cjxTaW1wbGVGb250RGF0YT4gRm9udENhY2hlOjpn ZXRGb250RGF0YUZvckNoYXJhY3RlcnMoY29uc3QgRm9udCYgZm9udCwKICAgICAgICAgICAgIGNv bnN0IFZlY3RvcjxEV09SRCwgND4mIENKS0NvZGVQYWdlTWFza3MgPSBnZXRDSktDb2RlUGFnZU1h c2tzKCk7CiAgICAgICAgICAgICB1bnNpZ25lZCBudW1Db2RlUGFnZXMgPSBDSktDb2RlUGFnZU1h c2tzLnNpemUoKTsKICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBudW1Db2Rl UGFnZXM7ICsraSkgewotI2lmIGRlZmluZWQoSU1MQU5HX0ZPTlRfTElOSykgJiYgKElNTEFOR19G T05UX0xJTksgPT0gMikKLSAgICAgICAgICAgICAgICBoZm9udCA9IGNyZWF0ZU1MYW5nRm9udChs YW5nRm9udExpbmssIGdfc2NyZWVuREMsIENKS0NvZGVQYWdlTWFza3NbaV0pOwotI2Vsc2UKICAg ICAgICAgICAgICAgICBoZm9udCA9IGNyZWF0ZU1MYW5nRm9udChsYW5nRm9udExpbmssIGdfc2Ny ZWVuREMsIG9yaWdGb250LCBDSktDb2RlUGFnZU1hc2tzW2ldKTsKLSNlbmRpZgogICAgICAgICAg ICAgICAgIGlmICghaGZvbnQpCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCkBAIC0y NDksMTEgKzIzNiw3IEBAIFBhc3NSZWZQdHI8U2ltcGxlRm9udERhdGE+IEZvbnRDYWNoZTo6Z2V0 Rm9udERhdGFGb3JDaGFyYWN0ZXJzKGNvbnN0IEZvbnQmIGZvbnQsCiAgICAgICAgICAgICAgICAg aWYgKGhmb250ICYmICEoY29kZVBhZ2VzICYgQ0pLQ29kZVBhZ2VNYXNrc1tpXSkpIHsKICAgICAg ICAgICAgICAgICAgICAgLy8gV2UgYXNrZWQgYWJvdXQgYSBjb2RlIHBhZ2UgdGhhdCBpcyBub3Qg b25lIG9mIHRoZSBjb2RlIHBhZ2VzCiAgICAgICAgICAgICAgICAgICAgIC8vIHJldHVybmVkIGJ5 IE1MYW5nLCBzbyB0aGUgZm9udCBtaWdodCBub3QgY29udGFpbiB0aGUgY2hhcmFjdGVyLgotI2lm IGRlZmluZWQoSU1MQU5HX0ZPTlRfTElOSykgJiYgKElNTEFOR19GT05UX0xJTksgPT0gMikKLSAg ICAgICAgICAgICAgICAgICAgaWYgKCFjdXJyZW50Rm9udENvbnRhaW5zQ2hhcmFjdGVyKGxhbmdG b250TGluaywgZ19zY3JlZW5EQywgY2hhcmFjdGVyKSkKLSNlbHNlCiAgICAgICAgICAgICAgICAg ICAgIGlmICghY3VycmVudEZvbnRDb250YWluc0NoYXJhY3RlcihsYW5nRm9udExpbmssIGdfc2Ny ZWVuREMsIGhmb250LCBjaGFyYWN0ZXIsIG5hbWUpKQotI2VuZGlmCiAgICAgICAgICAgICAgICAg ICAgIHsKICAgICAgICAgICAgICAgICAgICAgICAgIFNlbGVjdE9iamVjdChnX3NjcmVlbkRDLCBv bGRGb250KTsKICAgICAgICAgICAgICAgICAgICAgICAgIGxhbmdGb250TGluay0+UmVsZWFzZUZv bnQoaGZvbnQpOwpAQCAtMjY0LDExICsyNDcsNyBAQCBQYXNzUmVmUHRyPFNpbXBsZUZvbnREYXRh PiBGb250Q2FjaGU6OmdldEZvbnREYXRhRm9yQ2hhcmFjdGVycyhjb25zdCBGb250JiBmb250LAog ICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2Ugewot I2lmIGRlZmluZWQoSU1MQU5HX0ZPTlRfTElOSykgJiYgKElNTEFOR19GT05UX0xJTksgPT0gMikK LSAgICAgICAgICAgIGhmb250ID0gY3JlYXRlTUxhbmdGb250KGxhbmdGb250TGluaywgZ19zY3Jl ZW5EQywgY29kZVBhZ2VzLCBjaGFyYWN0ZXIpOwotI2Vsc2UKLSAgICAgICAgICAgIGhmb250ID0g Y3JlYXRlTUxhbmdGb250KGxhbmdGb250TGluaywgZ19zY3JlZW5EQywgb3JpZ0ZvbnQsIGNvZGVQ YWdlcyk7Ci0jZW5kaWYKKyAgICAgICAgICAgIGhmb250ID0gY3JlYXRlTUxhbmdGb250KGxhbmdG b250TGluaywgZ19zY3JlZW5EQywgb3JpZ0ZvbnQsIGNvZGVQYWdlcywgY2hhcmFjdGVyKTsKICAg ICAgICAgICAgIFNlbGVjdE9iamVjdChnX3NjcmVlbkRDLCBoZm9udCk7CiAgICAgICAgICAgICBH ZXRUZXh0RmFjZShnX3NjcmVlbkRDLCBMRl9GQUNFU0laRSwgbmFtZSk7CiAgICAgICAgIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL1NpbXBsZUZv bnREYXRhV2luQ0UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2Uv U2ltcGxlRm9udERhdGFXaW5DRS5jcHAKaW5kZXggZjk3MWMxOC4uNzZiNGVjMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvU2ltcGxlRm9udERhdGFX aW5DRS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvU2lt cGxlRm9udERhdGFXaW5DRS5jcHAKQEAgLTg3LDExICs4Nyw3IEBAIGJvb2wgU2ltcGxlRm9udERh dGE6OmNvbnRhaW5zQ2hhcmFjdGVycyhjb25zdCBVQ2hhciogY2hhcmFjdGVycywgaW50IGxlbmd0 aCkgY29uCiAgICAgLy8gY292ZXIgYSBnaXZlbiBjb2RlIHBhZ2U/CiAKICAgICAvLyBGSVhNRTog aW4gdGhlIGNhc2UgdGhhdCB3ZSBmYWlsZWQgdG8gZ2V0IHRoZSBpbnRlcmZhY2UsIHN0aWxsIHVz ZSB0aGUgZm9udC4KLSNpZiBkZWZpbmVkKElNTEFOR19GT05UX0xJTkspICYmIChJTUxBTkdfRk9O VF9MSU5LID09IDIpCi0gICAgSU1MYW5nRm9udExpbmsyKiBsYW5nRm9udExpbmsgPSBmb250Q2Fj aGUoKS0+Z2V0Rm9udExpbmtJbnRlcmZhY2UoKTsKLSNlbHNlCi0gICAgSU1MYW5nRm9udExpbmsq IGxhbmdGb250TGluayA9IGZvbnRDYWNoZSgpLT5nZXRGb250TGlua0ludGVyZmFjZSgpOwotI2Vu ZGlmCisgICAgSU1MYW5nRm9udExpbmtUeXBlKiBsYW5nRm9udExpbmsgPSBmb250Q2FjaGUoKS0+ Z2V0Rm9udExpbmtJbnRlcmZhY2UoKTsKICAgICBpZiAoIWxhbmdGb250TGluaykKICAgICAgICAg cmV0dXJuIHRydWU7CiAK 200006 2013-04-29 07:21:48 -0700 2013-04-29 09:32:05 -0700 Patch bug-115198-20130429162103.patch text/plain 8928 paroga U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5Mjc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDJhNjQxMzEzZDBhNWFjZmNmM2Y5NDli NGMwN2QxMDVmNDRiMGEwMmUuLjFmM2E3MmRhMDY1ODJjMDhmZTcxZDc5MmZiNGE2M2MxNTFlNWY0 MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTMtMDQtMjkgIFBhdHJpY2sgR2Fuc3RlcmVyICA8 cGFyb2dhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dJTl0gQWRkIFdURl9VU0VfSU1MQU5HX0ZP TlRfTElOSzIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTExNTE5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogd3RmL1BsYXRmb3JtLmg6CisKIDIwMTMtMDQtMjkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8 Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBtYWtlIGRpc3Rj aGVjay4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwppbmRleCA0N2NlN2RlNjQyMDRmYWNmYjg0MWIxMjA2MTY1YjMzM2JlY2Ni MGM2Li42NTQ2ODcyNzEwNWQ3ZDkyOTRjM2RjNDZlNjIwNTJiNGI2ZTc1MzYzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjMgQEAKKzIwMTMtMDQtMjkgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dh QHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dJTl0gQWRkIFdURl9VU0VfSU1MQU5HX0ZPTlRfTElO SzIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTE5 OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0 aGlzIG5ldyBkZWZpbmUgdG8gaGF2ZSBhIGNlbnRyYWwgcGxhY2UgZm9yIHN3aXRjaGluZworICAg ICAgICB0aGUgSU1MYW5nRm9udExpbmtUeXBlIGFuZCBhZG9wIGFsbCB1c2FnZXMgb2YgdGhlIHR5 cGUuCisgICAgICAgIFRoaXMgbWFrZXMgdGhlIHVzYWdlIG9mIHRoZSBjb2RlIGVhc2llciBvbiBk ZXNrdG9wIHBjcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oOgor ICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvRm9u dENhY2hlV2luQ0UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3VycmVudEZvbnRDb250YWluc0No YXJhY3Rlcik6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVNTGFuZ0ZvbnQpOgorICAgICAgICAo V2ViQ29yZTo6Rm9udENhY2hlOjpnZXRGb250RGF0YUZvckNoYXJhY3RlcnMpOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL1NpbXBsZUZvbnREYXRhV2luQ0UuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U2ltcGxlRm9udERhdGE6OmNvbnRhaW5zQ2hhcmFjdGVycyk6CisKIDIwMTMt MDQtMjkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQuIEZpeCBtYWtlIGRpc3RjaGVjay4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X VEYvd3RmL1BsYXRmb3JtLmggYi9Tb3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybS5oCmluZGV4IGM5YzJj NzM0ZDI4M2E0MWZhOTk1MDQzMWZmOTVhMTFhYWE2YTljOWMuLjFlNDdkOTZhYTI3NDAwMmNiODZi N2ZkMDBmOThlZmY1YzBiYjY1NjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL1BsYXRmb3Jt LmgKKysrIGIvU291cmNlL1dURi93dGYvUGxhdGZvcm0uaApAQCAtOTIyLDYgKzkyMiwxMCBAQAog I2RlZmluZSBXVEZfVVNFX1VOSVhfRE9NQUlOX1NPQ0tFVFMgMQogI2VuZGlmCiAKKyNpZiAhZGVm aW5lZChXVEZfVVNFX0lNTEFOR19GT05UX0xJTksyKSAmJiAhT1MoV0lOQ0UpCisjZGVmaW5lIFdU Rl9VU0VfSU1MQU5HX0ZPTlRfTElOSzIgMQorI2VuZGlmCisKICNpZiAhZGVmaW5lZChFTkFCTEVf Q09NUEFSRV9BTkRfU1dBUCkgJiYgKE9TKFdJTkRPV1MpIHx8IChDT01QSUxFUihHQ0MpICYmIChD UFUoWDg2KSB8fCBDUFUoWDg2XzY0KSB8fCBDUFUoQVJNX1RIVU1CMikpKSkKICNkZWZpbmUgRU5B QkxFX0NPTVBBUkVfQU5EX1NXQVAgMQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0ZvbnRDYWNoZS5oCmluZGV4IDA1MDY2NmRhOTA4NjM0OWUyOTAyZjZhMDRkMjk5 ZDFhZjBmYTRiZmEuLjYyNGY3NjhlMDdhMDhhMGIwODk4ODU2NGNkYjViNGJjMzI1YTE4ODIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCkBAIC01NSw3 ICs1NSw3IEBAIGNsYXNzIE9wZW5UeXBlVmVydGljYWxEYXRhOwogY2xhc3MgU2ltcGxlRm9udERh dGE7CiAKICNpZiBQTEFURk9STShXSU4pCi0jaWYgIU9TKFdJTkNFKSB8fCBkZWZpbmVkKElNTEFO R19GT05UX0xJTkspICYmIChJTUxBTkdfRk9OVF9MSU5LID09IDIpCisjaWYgVVNFKElNTEFOR19G T05UX0xJTksyKQogdHlwZWRlZiBJTUxhbmdGb250TGluazIgSU1MYW5nRm9udExpbmtUeXBlOwog I2Vsc2UKIHR5cGVkZWYgSU1MYW5nRm9udExpbmsgSU1MYW5nRm9udExpbmtUeXBlOwpAQCAtODIs MTIgKzgyLDEwIEBAIHB1YmxpYzoKIAogI2lmIFBMQVRGT1JNKFdJTikKICAgICBJTUxhbmdGb250 TGlua1R5cGUqIGdldEZvbnRMaW5rSW50ZXJmYWNlKCk7Ci0jaWYgT1MoV0lOQ0UpCiAgICAgc3Rh dGljIHZvaWQgY29tSW5pdGlhbGl6ZSgpOwogICAgIHN0YXRpYyB2b2lkIGNvbVVuaW5pdGlhbGl6 ZSgpOwogICAgIHN0YXRpYyBJTXVsdGlMYW5ndWFnZSogZ2V0TXVsdGlMYW5ndWFnZUludGVyZmFj ZSgpOwogI2VuZGlmCi0jZW5kaWYKIAogICAgIHZvaWQgZ2V0VHJhaXRzSW5GYW1pbHkoY29uc3Qg QXRvbWljU3RyaW5nJiwgVmVjdG9yPHVuc2lnbmVkPiYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9Gb250Q2FjaGVXaW5DRS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9Gb250Q2FjaGVXaW5DRS5jcHAKaW5k ZXggN2I4MDIwZDg3YjJkZTJkZjIxNDVjNWRkNTc3MzIxNjgwNjVhNGFlZi4uYWQxOTczNzczYWU1 OGQ5MWExMTQyYTQ0NGE2MDk4OWJlMzYxYjk2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvRm9udENhY2hlV2luQ0UuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0ZvbnRDYWNoZVdpbkNFLmNwcApAQCAtNjQs OSArNjQsOSBAQCBJTUxhbmdGb250TGlua1R5cGUqIEZvbnRDYWNoZTo6Z2V0Rm9udExpbmtJbnRl cmZhY2UoKQogICAgIHJldHVybiBsYW5nRm9udExpbms7CiB9CiAKLSNpZiBkZWZpbmVkKElNTEFO R19GT05UX0xJTkspICYmIChJTUxBTkdfRk9OVF9MSU5LID09IDIpCi1zdGF0aWMgYm9vbCBjdXJy ZW50Rm9udENvbnRhaW5zQ2hhcmFjdGVyKElNTGFuZ0ZvbnRMaW5rMiogbGFuZ0ZvbnRMaW5rLCBI REMgaGRjLCBVQ2hhciBjaGFyYWN0ZXIpCitzdGF0aWMgYm9vbCBjdXJyZW50Rm9udENvbnRhaW5z Q2hhcmFjdGVyKElNTGFuZ0ZvbnRMaW5rVHlwZSogbGFuZ0ZvbnRMaW5rLCBIREMgaGRjLCBIRk9O VCBoZm9udCwgVUNoYXIgY2hhcmFjdGVyLCBjb25zdCB3Y2hhcl90KiBmYWNlTmFtZSkKIHsKKyNp ZiBVU0UoSU1MQU5HX0ZPTlRfTElOSzIpCiAgICAgVUlOVCB1bmljb2RlUmFuZ2VzOwogICAgIGlm IChTX09LICE9IGxhbmdGb250TGluay0+R2V0Rm9udFVuaWNvZGVSYW5nZXMoaGRjLCAmdW5pY29k ZVJhbmdlcywgMCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTgyLDEyICs4Miw3IEBAIHN0 YXRpYyBib29sIGN1cnJlbnRGb250Q29udGFpbnNDaGFyYWN0ZXIoSU1MYW5nRm9udExpbmsyKiBs YW5nRm9udExpbmssIEhEQyBoZGMsCiAgICAgICAgIGlmIChpLT53Y1RvID49IGNoYXJhY3RlcikK ICAgICAgICAgICAgIHJldHVybiBpLT53Y0Zyb20gPD0gY2hhcmFjdGVyOwogICAgIH0KLQotICAg IHJldHVybiBmYWxzZTsKLX0KICNlbHNlCi1zdGF0aWMgYm9vbCBjdXJyZW50Rm9udENvbnRhaW5z Q2hhcmFjdGVyKElNTGFuZ0ZvbnRMaW5rKiBsYW5nRm9udExpbmssIEhEQyBoZGMsIEhGT05UIGhm b250LCBVQ2hhciBjaGFyYWN0ZXIsIGNvbnN0IHdjaGFyX3QqIGZhY2VOYW1lKQotewogICAgIERX T1JEIGZvbnRDb2RlUGFnZXMgPSAwLCBjaGFyQ29kZVBhZ2VzID0gMDsKICAgICBIUkVTVUxUIHJl c3VsdCA9IGxhbmdGb250TGluay0+R2V0Rm9udENvZGVQYWdlcyhoZGMsIGhmb250LCAmZm9udENv ZGVQYWdlcyk7CiAgICAgaWYgKHJlc3VsdCAhPSBTX09LKQpAQCAtOTksMjkgKzk0LDI1IEBAIHN0 YXRpYyBib29sIGN1cnJlbnRGb250Q29udGFpbnNDaGFyYWN0ZXIoSU1MYW5nRm9udExpbmsqIGxh bmdGb250TGluaywgSERDIGhkYywKICAgICBmb250Q29kZVBhZ2VzIHw9IEZvbnRQbGF0Zm9ybURh dGE6OmdldEtub3duRm9udENvZGVQYWdlcyhmYWNlTmFtZSk7CiAgICAgaWYgKGZvbnRDb2RlUGFn ZXMgJiBjaGFyQ29kZVBhZ2VzKQogICAgICAgICByZXR1cm4gdHJ1ZTsKKyNlbmRpZgogCiAgICAg cmV0dXJuIGZhbHNlOwogfQotI2VuZGlmCiAKLSNpZiBkZWZpbmVkKElNTEFOR19GT05UX0xJTksp ICYmIChJTUxBTkdfRk9OVF9MSU5LID09IDIpCi1zdGF0aWMgSEZPTlQgY3JlYXRlTUxhbmdGb250 KElNTGFuZ0ZvbnRMaW5rMiogbGFuZ0ZvbnRMaW5rLCBIREMgaGRjLCBEV09SRCBjb2RlUGFnZU1h c2ssIFVDaGFyIGNoYXJhY3RlciA9IDApCitzdGF0aWMgSEZPTlQgY3JlYXRlTUxhbmdGb250KElN TGFuZ0ZvbnRMaW5rVHlwZSogbGFuZ0ZvbnRMaW5rLCBIREMgaGRjLCBjb25zdCBGb250UGxhdGZv cm1EYXRhJiByZWZGb250LCBEV09SRCBjb2RlUGFnZU1hc2ssIFVDaGFyIGNoYXJhY3RlciA9IDAp CiB7CiAgICAgSEZPTlQgbWxhbmdGb250OwotICAgIGlmIChTVUNDRUVERUQobGFuZ0ZvbnRMaW5r LT5NYXBGb250KGhkYywgY29kZVBhZ2VNYXNrLCBjaGFyYWN0ZXIsICZtbGFuZ0ZvbnQpKSkKLSAg ICAgICAgcmV0dXJuIG1sYW5nRm9udDsKIAotICAgIHJldHVybiAwOwotfQorI2lmIFVTRShJTUxB TkdfRk9OVF9MSU5LMikKKyAgICBIUkVTVUxUIHJlc3VsdCA9IGxhbmdGb250TGluay0+TWFwRm9u dChoZGMsIGNvZGVQYWdlTWFzaywgY2hhcmFjdGVyLCAmbWxhbmdGb250KTsKICNlbHNlCi1zdGF0 aWMgSEZPTlQgY3JlYXRlTUxhbmdGb250KElNTGFuZ0ZvbnRMaW5rKiBsYW5nRm9udExpbmssIEhE QyBoZGMsIGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIHJlZkZvbnQsIERXT1JEIGNvZGVQYWdlTWFz aykKLXsKLSAgICBIRk9OVCBtbGFuZ0ZvbnQ7Ci0gICAgTFJFU1VMVCByZXN1bHQgPSBsYW5nRm9u dExpbmstPk1hcEZvbnQoaGRjLCBjb2RlUGFnZU1hc2ssIHJlZkZvbnQuaGZvbnQoKSwgJm1sYW5n Rm9udCk7CisgICAgSFJFU1VMVCByZXN1bHQgPSBsYW5nRm9udExpbmstPk1hcEZvbnQoaGRjLCBj b2RlUGFnZU1hc2ssIHJlZkZvbnQuaGZvbnQoKSwgJm1sYW5nRm9udCk7CisjZW5kaWYKIAotICAg IHJldHVybiByZXN1bHQgPT0gU19PSyA/IG1sYW5nRm9udCA6IDA7CisgICAgaWYgKFNVQ0NFRURF RChyZXN1bHQpKQorICAgICAgICByZXR1cm4gbWxhbmdGb250OworICAgIHJldHVybiAwOwogfQot I2VuZGlmCiAKIHN0YXRpYyBjb25zdCBWZWN0b3I8RFdPUkQsIDQ+JiBnZXRDSktDb2RlUGFnZU1h c2tzKCkKIHsKQEAgLTIzNSwxMSArMjI2LDcgQEAgUGFzc1JlZlB0cjxTaW1wbGVGb250RGF0YT4g Rm9udENhY2hlOjpnZXRGb250RGF0YUZvckNoYXJhY3RlcnMoY29uc3QgRm9udCYgZm9udCwKICAg ICAgICAgICAgIGNvbnN0IFZlY3RvcjxEV09SRCwgND4mIENKS0NvZGVQYWdlTWFza3MgPSBnZXRD SktDb2RlUGFnZU1hc2tzKCk7CiAgICAgICAgICAgICB1bnNpZ25lZCBudW1Db2RlUGFnZXMgPSBD SktDb2RlUGFnZU1hc2tzLnNpemUoKTsKICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7 IGkgPCBudW1Db2RlUGFnZXM7ICsraSkgewotI2lmIGRlZmluZWQoSU1MQU5HX0ZPTlRfTElOSykg JiYgKElNTEFOR19GT05UX0xJTksgPT0gMikKLSAgICAgICAgICAgICAgICBoZm9udCA9IGNyZWF0 ZU1MYW5nRm9udChsYW5nRm9udExpbmssIGdfc2NyZWVuREMsIENKS0NvZGVQYWdlTWFza3NbaV0p OwotI2Vsc2UKICAgICAgICAgICAgICAgICBoZm9udCA9IGNyZWF0ZU1MYW5nRm9udChsYW5nRm9u dExpbmssIGdfc2NyZWVuREMsIG9yaWdGb250LCBDSktDb2RlUGFnZU1hc2tzW2ldKTsKLSNlbmRp ZgogICAgICAgICAgICAgICAgIGlmICghaGZvbnQpCiAgICAgICAgICAgICAgICAgICAgIGNvbnRp bnVlOwogCkBAIC0yNDksMTEgKzIzNiw3IEBAIFBhc3NSZWZQdHI8U2ltcGxlRm9udERhdGE+IEZv bnRDYWNoZTo6Z2V0Rm9udERhdGFGb3JDaGFyYWN0ZXJzKGNvbnN0IEZvbnQmIGZvbnQsCiAgICAg ICAgICAgICAgICAgaWYgKGhmb250ICYmICEoY29kZVBhZ2VzICYgQ0pLQ29kZVBhZ2VNYXNrc1tp XSkpIHsKICAgICAgICAgICAgICAgICAgICAgLy8gV2UgYXNrZWQgYWJvdXQgYSBjb2RlIHBhZ2Ug dGhhdCBpcyBub3Qgb25lIG9mIHRoZSBjb2RlIHBhZ2VzCiAgICAgICAgICAgICAgICAgICAgIC8v IHJldHVybmVkIGJ5IE1MYW5nLCBzbyB0aGUgZm9udCBtaWdodCBub3QgY29udGFpbiB0aGUgY2hh cmFjdGVyLgotI2lmIGRlZmluZWQoSU1MQU5HX0ZPTlRfTElOSykgJiYgKElNTEFOR19GT05UX0xJ TksgPT0gMikKLSAgICAgICAgICAgICAgICAgICAgaWYgKCFjdXJyZW50Rm9udENvbnRhaW5zQ2hh cmFjdGVyKGxhbmdGb250TGluaywgZ19zY3JlZW5EQywgY2hhcmFjdGVyKSkKLSNlbHNlCiAgICAg ICAgICAgICAgICAgICAgIGlmICghY3VycmVudEZvbnRDb250YWluc0NoYXJhY3RlcihsYW5nRm9u dExpbmssIGdfc2NyZWVuREMsIGhmb250LCBjaGFyYWN0ZXIsIG5hbWUpKQotI2VuZGlmCiAgICAg ICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAgICAgICAgIFNlbGVjdE9iamVjdChn X3NjcmVlbkRDLCBvbGRGb250KTsKICAgICAgICAgICAgICAgICAgICAgICAgIGxhbmdGb250TGlu ay0+UmVsZWFzZUZvbnQoaGZvbnQpOwpAQCAtMjY0LDExICsyNDcsNyBAQCBQYXNzUmVmUHRyPFNp bXBsZUZvbnREYXRhPiBGb250Q2FjaGU6OmdldEZvbnREYXRhRm9yQ2hhcmFjdGVycyhjb25zdCBG b250JiBmb250LAogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAgICAg ICB9IGVsc2UgewotI2lmIGRlZmluZWQoSU1MQU5HX0ZPTlRfTElOSykgJiYgKElNTEFOR19GT05U X0xJTksgPT0gMikKLSAgICAgICAgICAgIGhmb250ID0gY3JlYXRlTUxhbmdGb250KGxhbmdGb250 TGluaywgZ19zY3JlZW5EQywgY29kZVBhZ2VzLCBjaGFyYWN0ZXIpOwotI2Vsc2UKLSAgICAgICAg ICAgIGhmb250ID0gY3JlYXRlTUxhbmdGb250KGxhbmdGb250TGluaywgZ19zY3JlZW5EQywgb3Jp Z0ZvbnQsIGNvZGVQYWdlcyk7Ci0jZW5kaWYKKyAgICAgICAgICAgIGhmb250ID0gY3JlYXRlTUxh bmdGb250KGxhbmdGb250TGluaywgZ19zY3JlZW5EQywgb3JpZ0ZvbnQsIGNvZGVQYWdlcywgY2hh cmFjdGVyKTsKICAgICAgICAgICAgIFNlbGVjdE9iamVjdChnX3NjcmVlbkRDLCBoZm9udCk7CiAg ICAgICAgICAgICBHZXRUZXh0RmFjZShnX3NjcmVlbkRDLCBMRl9GQUNFU0laRSwgbmFtZSk7CiAg ICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dp bmNlL1NpbXBsZUZvbnREYXRhV2luQ0UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3Mvd2luY2UvU2ltcGxlRm9udERhdGFXaW5DRS5jcHAKaW5kZXggZjk3MWMxODhlYzA3YWU1 Mzc1Y2Y4ZTYxNzMyYjM4ZDBlYTExMjFhOS4uNzZiNGVjMDU1YmM5ZmY3MzU4N2ZiNTVkOTYxNThk NDkwOWJhNTRkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv d2luY2UvU2ltcGxlRm9udERhdGFXaW5DRS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvd2luY2UvU2ltcGxlRm9udERhdGFXaW5DRS5jcHAKQEAgLTg3LDExICs4Nyw3 IEBAIGJvb2wgU2ltcGxlRm9udERhdGE6OmNvbnRhaW5zQ2hhcmFjdGVycyhjb25zdCBVQ2hhciog Y2hhcmFjdGVycywgaW50IGxlbmd0aCkgY29uCiAgICAgLy8gY292ZXIgYSBnaXZlbiBjb2RlIHBh Z2U/CiAKICAgICAvLyBGSVhNRTogaW4gdGhlIGNhc2UgdGhhdCB3ZSBmYWlsZWQgdG8gZ2V0IHRo ZSBpbnRlcmZhY2UsIHN0aWxsIHVzZSB0aGUgZm9udC4KLSNpZiBkZWZpbmVkKElNTEFOR19GT05U X0xJTkspICYmIChJTUxBTkdfRk9OVF9MSU5LID09IDIpCi0gICAgSU1MYW5nRm9udExpbmsyKiBs YW5nRm9udExpbmsgPSBmb250Q2FjaGUoKS0+Z2V0Rm9udExpbmtJbnRlcmZhY2UoKTsKLSNlbHNl Ci0gICAgSU1MYW5nRm9udExpbmsqIGxhbmdGb250TGluayA9IGZvbnRDYWNoZSgpLT5nZXRGb250 TGlua0ludGVyZmFjZSgpOwotI2VuZGlmCisgICAgSU1MYW5nRm9udExpbmtUeXBlKiBsYW5nRm9u dExpbmsgPSBmb250Q2FjaGUoKS0+Z2V0Rm9udExpbmtJbnRlcmZhY2UoKTsKICAgICBpZiAoIWxh bmdGb250TGluaykKICAgICAgICAgcmV0dXJuIHRydWU7CiAK