102584 2012-11-16 23:01:02 -0800 [WIN] Add a IMLangFontLinkType typedef 2012-11-18 21:45:55 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 paroga paroga webkit.review.bot oldest_to_newest 769911 0 paroga 2012-11-16 23:01:02 -0800 [WIN] Add a IMLangFontLinkType typedef 769912 1 174812 paroga 2012-11-16 23:07:11 -0800 Created attachment 174812 Patch 770328 2 174812 bfulgham 2012-11-18 21:38:36 -0800 Comment on attachment 174812 Patch Very nice cleanup. 770335 3 174812 webkit.review.bot 2012-11-18 21:45:52 -0800 Comment on attachment 174812 Patch Clearing flags on attachment: 174812 Committed r135108: <http://trac.webkit.org/changeset/135108> 770336 4 webkit.review.bot 2012-11-18 21:45:55 -0800 All reviewed patches have been landed. Closing bug. 174812 2012-11-16 23:07:11 -0800 2012-11-18 21:45:52 -0800 Patch bug-102584.patch text/plain 10673 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmZDU3ZDE0Li4xNmZmZjViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTItMTEtMTcgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgW1dJTl0gQWRkIGEgSU1MYW5nRm9udExpbmtUeXBlIHR5cGVkZWYKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjU4NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIGNlbnRyYWwgdHlw ZWRlZiBmb3IgSU1MYW5nRm9udExpbmsoMikgdG8gZ2V0IHJpZCBvZiBhIGJ1bmNoIG9mIGlmZGVm cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oOgorICAgICAgICAo V2ViQ29yZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDYWNoZVdpbi5j cHA6CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OmdldEZvbnRMaW5rSW50ZXJmYWNlKToK KyAgICAgICAgKFdlYkNvcmU6OmdldENKS0NvZGVQYWdlTWFza3MpOgorICAgICAgICAoV2ViQ29y ZTo6Y3JlYXRlTUxhbmdGb250KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRDYWNoZTo6Z2V0Rm9u dERhdGFGb3JDaGFyYWN0ZXJzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vU2lt cGxlRm9udERhdGFXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlRm9udERhdGE6OmNv bnRhaW5zQ2hhcmFjdGVycyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvRm9u dENhY2hlV2luQ0UuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpG b250Q2FjaGU6OmdldEZvbnRMaW5rSW50ZXJmYWNlKToKKyAgICAgICAgKFdlYkNvcmU6OmdldENK S0NvZGVQYWdlTWFza3MpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpnZXRGb250RGF0 YUZvckNoYXJhY3RlcnMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0ZvbnRQ bGF0Zm9ybURhdGEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udEZhbWlseUNvZGVQYWdlSW5m bzo6Y29kZVBhZ2VzKToKKyAgICAgICAgKFdlYkNvcmU6OkZpeGVkU2l6ZUZvbnREYXRhOjpjcmVh dGUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0dseXBoUGFnZVRyZWVOb2Rl V2luQ0UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R2x5cGhQYWdlOjpmaWxsKToKKwogMjAxMi0x MS0xNiAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBC dWlsZCBmaXggZm9yIFdpbkNFIGFmdGVyIHIxMzQ5MzYuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCmluZGV4IGFiZmM3YmEuLmZjNzYyM2UgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCkBAIC01NCw2ICs1NCwx NCBAQCBjbGFzcyBGb250U2VsZWN0b3I7CiBjbGFzcyBPcGVuVHlwZVZlcnRpY2FsRGF0YTsKIGNs YXNzIFNpbXBsZUZvbnREYXRhOwogCisjaWYgUExBVEZPUk0oV0lOKQorI2lmICFPUyhXSU5DRSkg fHwgZGVmaW5lZChJTUxBTkdfRk9OVF9MSU5LKSAmJiAoSU1MQU5HX0ZPTlRfTElOSyA9PSAyKQor dHlwZWRlZiBJTUxhbmdGb250TGluazIgSU1MYW5nRm9udExpbmtUeXBlOworI2Vsc2UKK3R5cGVk ZWYgSU1MYW5nRm9udExpbmsgSU1MYW5nRm9udExpbmtUeXBlOworI2VuZGlmCisjZW5kaWYKKwog Y2xhc3MgRm9udENhY2hlIHsKICAgICBmcmllbmQgY2xhc3MgRm9udENhY2hlUHVyZ2VQcmV2ZW50 ZXI7CiAKQEAgLTcyLDE3ICs4MCwxMyBAQCBwdWJsaWM6CiAgICAgLy8gQWxzbyBpbXBsZW1lbnRl ZCBieSB0aGUgcGxhdGZvcm0uCiAgICAgdm9pZCBwbGF0Zm9ybUluaXQoKTsKIAotI2lmIE9TKFdJ TkNFKSAmJiAhUExBVEZPUk0oUVQpCi0jaWYgZGVmaW5lZChJTUxBTkdfRk9OVF9MSU5LKSAmJiAo SU1MQU5HX0ZPTlRfTElOSyA9PSAyKQotICAgIElNTGFuZ0ZvbnRMaW5rMiogZ2V0Rm9udExpbmtJ bnRlcmZhY2UoKTsKLSNlbHNlCi0gICAgSU1MYW5nRm9udExpbmsqIGdldEZvbnRMaW5rSW50ZXJm YWNlKCk7Ci0jZW5kaWYKKyNpZiBQTEFURk9STShXSU4pCisgICAgSU1MYW5nRm9udExpbmtUeXBl KiBnZXRGb250TGlua0ludGVyZmFjZSgpOworI2lmIE9TKFdJTkNFKQogICAgIHN0YXRpYyB2b2lk IGNvbUluaXRpYWxpemUoKTsKICAgICBzdGF0aWMgdm9pZCBjb21VbmluaXRpYWxpemUoKTsKICAg ICBzdGF0aWMgSU11bHRpTGFuZ3VhZ2UqIGdldE11bHRpTGFuZ3VhZ2VJbnRlcmZhY2UoKTsKLSNl bGlmIFBMQVRGT1JNKFdJTikKLSAgICBJTUxhbmdGb250TGluazIqIGdldEZvbnRMaW5rSW50ZXJm YWNlKCk7CisjZW5kaWYKICNlbmRpZgogCiAgICAgdm9pZCBnZXRUcmFpdHNJbkZhbWlseShjb25z dCBBdG9taWNTdHJpbmcmLCBWZWN0b3I8dW5zaWduZWQ+Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udENhY2hlV2luLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwCmluZGV4IDJiZWM2 MmEuLmVlNTVlMWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3dpbi9Gb250Q2FjaGVXaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3dpbi9Gb250Q2FjaGVXaW4uY3BwCkBAIC01NCw3ICs1NCw3IEBAIHZvaWQgRm9udENhY2hl OjpwbGF0Zm9ybUluaXQoKQogI2VuZGlmCiB9CiAKLUlNTGFuZ0ZvbnRMaW5rMiogRm9udENhY2hl OjpnZXRGb250TGlua0ludGVyZmFjZSgpCitJTUxhbmdGb250TGlua1R5cGUqIEZvbnRDYWNoZTo6 Z2V0Rm9udExpbmtJbnRlcmZhY2UoKQogewogICAgIHN0YXRpYyBJTXVsdGlMYW5ndWFnZSAqbXVs dGlMYW5ndWFnZTsKICAgICBpZiAoIW11bHRpTGFuZ3VhZ2UpIHsKQEAgLTYyLDcgKzYyLDcgQEAg SU1MYW5nRm9udExpbmsyKiBGb250Q2FjaGU6OmdldEZvbnRMaW5rSW50ZXJmYWNlKCkKICAgICAg ICAgICAgIHJldHVybiAwOwogICAgIH0KIAotICAgIHN0YXRpYyBJTUxhbmdGb250TGluazIqIGxh bmdGb250TGluazsKKyAgICBzdGF0aWMgSU1MYW5nRm9udExpbmtUeXBlKiBsYW5nRm9udExpbms7 CiAgICAgaWYgKCFsYW5nRm9udExpbmspIHsKICAgICAgICAgaWYgKG11bHRpTGFuZ3VhZ2UtPlF1 ZXJ5SW50ZXJmYWNlKCZsYW5nRm9udExpbmspICE9IFNfT0spCiAgICAgICAgICAgICByZXR1cm4g MDsKQEAgLTEzNiw3ICsxMzYsNyBAQCBzdGF0aWMgY29uc3QgVmVjdG9yPERXT1JELCA0PiYgZ2V0 Q0pLQ29kZVBhZ2VNYXNrcygpCiAgICAgc3RhdGljIGJvb2wgaW5pdGlhbGl6ZWQ7CiAgICAgaWYg KCFpbml0aWFsaXplZCkgewogICAgICAgICBpbml0aWFsaXplZCA9IHRydWU7Ci0gICAgICAgIElN TGFuZ0ZvbnRMaW5rMiogbGFuZ0ZvbnRMaW5rID0gZm9udENhY2hlKCktPmdldEZvbnRMaW5rSW50 ZXJmYWNlKCk7CisgICAgICAgIElNTGFuZ0ZvbnRMaW5rVHlwZSogbGFuZ0ZvbnRMaW5rID0gZm9u dENhY2hlKCktPmdldEZvbnRMaW5rSW50ZXJmYWNlKCk7CiAgICAgICAgIGlmICghbGFuZ0ZvbnRM aW5rKQogICAgICAgICAgICAgcmV0dXJuIGNvZGVQYWdlTWFza3M7CiAKQEAgLTE3Myw3ICsxNzMs NyBAQCBzdGF0aWMgYm9vbCBjdXJyZW50Rm9udENvbnRhaW5zQ2hhcmFjdGVyKEhEQyBoZGMsIFVD aGFyIGNoYXJhY3RlcikKICAgICByZXR1cm4gaSAmJiBnbHlwaHNldC0+cmFuZ2VzW2kgLSAxXS53 Y0xvdyArIGdseXBoc2V0LT5yYW5nZXNbaSAtIDFdLmNHbHlwaHMgPiBjaGFyYWN0ZXI7CiB9CiAK LXN0YXRpYyBIRk9OVCBjcmVhdGVNTGFuZ0ZvbnQoSU1MYW5nRm9udExpbmsyKiBsYW5nRm9udExp bmssIEhEQyBoZGMsIERXT1JEIGNvZGVQYWdlTWFzaywgVUNoYXIgY2hhcmFjdGVyID0gMCkKK3N0 YXRpYyBIRk9OVCBjcmVhdGVNTGFuZ0ZvbnQoSU1MYW5nRm9udExpbmtUeXBlKiBsYW5nRm9udExp bmssIEhEQyBoZGMsIERXT1JEIGNvZGVQYWdlTWFzaywgVUNoYXIgY2hhcmFjdGVyID0gMCkKIHsK ICAgICBIRk9OVCBNTGFuZ0ZvbnQ7CiAgICAgSEZPTlQgaGZvbnQgPSAwOwpAQCAtMTk1LDcgKzE5 NSw3IEBAIFBhc3NSZWZQdHI8U2ltcGxlRm9udERhdGE+IEZvbnRDYWNoZTo6Z2V0Rm9udERhdGFG b3JDaGFyYWN0ZXJzKGNvbnN0IEZvbnQmIGZvbnQsCiAgICAgSEdESU9CSiBvbGRGb250ID0gU2Vs ZWN0T2JqZWN0KGhkYywgcHJpbWFyeUZvbnQpOwogICAgIEhGT05UIGhmb250ID0gMDsKIAotICAg IGlmIChJTUxhbmdGb250TGluazIqIGxhbmdGb250TGluayA9IGdldEZvbnRMaW5rSW50ZXJmYWNl KCkpIHsKKyAgICBpZiAoSU1MYW5nRm9udExpbmtUeXBlKiBsYW5nRm9udExpbmsgPSBnZXRGb250 TGlua0ludGVyZmFjZSgpKSB7CiAgICAgICAgIC8vIFRyeSBNTGFuZyBmb250IGxpbmtpbmcgZmly c3QuCiAgICAgICAgIERXT1JEIGNvZGVQYWdlcyA9IDA7CiAgICAgICAgIGxhbmdGb250TGluay0+ R2V0Q2hhckNvZGVQYWdlcyhjaGFyYWN0ZXIsICZjb2RlUGFnZXMpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhV2luLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVGb250RGF0YVdpbi5j cHAKaW5kZXggYmQyMWJhZS4uMmRlMjI0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhV2luLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vU2ltcGxlRm9udERhdGFXaW4uY3BwCkBAIC0xNTEs NyArMTUxLDcgQEAgYm9vbCBTaW1wbGVGb250RGF0YTo6Y29udGFpbnNDaGFyYWN0ZXJzKGNvbnN0 IFVDaGFyKiBjaGFyYWN0ZXJzLCBpbnQgbGVuZ3RoKSBjb24KICAgICAvLyBGSVhNRTogTWljcm9z b2Z0IGRvY3VtZW50YXRpb24gc2VlbXMgdG8gaW1wbHkgdGhhdCBjaGFyYWN0ZXJzIGNhbiBiZSBv dXRwdXQgdXNpbmcgYSBnaXZlbiBmb250IGFuZCBEQwogICAgIC8vIG1lcmVseSBieSB0ZXN0aW5n IGNvZGUgcGFnZSBpbnRlcnNlY3Rpb24uICBUaGlzIHNlZW1zIHN1c3BlY3QgdGhvdWdoLiAgQ2Fu J3QgYSBmb250IG9ubHkgcGFydGlhbGx5CiAgICAgLy8gY292ZXIgYSBnaXZlbiBjb2RlIHBhZ2U/ Ci0gICAgSU1MYW5nRm9udExpbmsyKiBsYW5nRm9udExpbmsgPSBmb250Q2FjaGUoKS0+Z2V0Rm9u dExpbmtJbnRlcmZhY2UoKTsKKyAgICBJTUxhbmdGb250TGlua1R5cGUqIGxhbmdGb250TGluayA9 IGZvbnRDYWNoZSgpLT5nZXRGb250TGlua0ludGVyZmFjZSgpOwogICAgIGlmICghbGFuZ0ZvbnRM aW5rKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0ZvbnRDYWNoZVdpbkNFLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0ZvbnRDYWNoZVdpbkNFLmNwcAppbmRleCA3NjQx ZWRkLi45YWI5MWExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy93aW5jZS9Gb250Q2FjaGVXaW5DRS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvd2luY2UvRm9udENhY2hlV2luQ0UuY3BwCkBAIC00NCwxMiArNDQsNyBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiBleHRlcm4gSERDIGdfc2NyZWVuREM7CiAKIHN0YXRpYyBJTXVsdGlM YW5ndWFnZSAqbXVsdGlMYW5ndWFnZSA9IDA7Ci0KLSNpZiBkZWZpbmVkKElNTEFOR19GT05UX0xJ TkspICYmIChJTUxBTkdfRk9OVF9MSU5LID09IDIpCi1zdGF0aWMgSU1MYW5nRm9udExpbmsyKiBs YW5nRm9udExpbmsgPSAwOwotI2Vsc2UKLXN0YXRpYyBJTUxhbmdGb250TGluayogbGFuZ0ZvbnRM aW5rID0gMDsKLSNlbmRpZgorc3RhdGljIElNTGFuZ0ZvbnRMaW5rVHlwZSogbGFuZ0ZvbnRMaW5r ID0gMDsKIAogSU11bHRpTGFuZ3VhZ2UqIEZvbnRDYWNoZTo6Z2V0TXVsdGlMYW5ndWFnZUludGVy ZmFjZSgpCiB7CkBAIC01OSwxMSArNTQsNyBAQCBJTXVsdGlMYW5ndWFnZSogRm9udENhY2hlOjpn ZXRNdWx0aUxhbmd1YWdlSW50ZXJmYWNlKCkKICAgICByZXR1cm4gbXVsdGlMYW5ndWFnZTsKIH0K IAotI2lmIGRlZmluZWQoSU1MQU5HX0ZPTlRfTElOSykgJiYgKElNTEFOR19GT05UX0xJTksgPT0g MikKLUlNTGFuZ0ZvbnRMaW5rMiogRm9udENhY2hlOjpnZXRGb250TGlua0ludGVyZmFjZSgpCi0j ZWxzZQotSU1MYW5nRm9udExpbmsqIEZvbnRDYWNoZTo6Z2V0Rm9udExpbmtJbnRlcmZhY2UoKQot I2VuZGlmCitJTUxhbmdGb250TGlua1R5cGUqIEZvbnRDYWNoZTo6Z2V0Rm9udExpbmtJbnRlcmZh Y2UoKQogewogICAgIGlmICghbGFuZ0ZvbnRMaW5rKSB7CiAgICAgICAgIGlmIChJTXVsdGlMYW5n dWFnZSogbWxpID0gZ2V0TXVsdGlMYW5ndWFnZUludGVyZmFjZSgpKQpAQCAtMTQ3LDExICsxMzgs NyBAQCBzdGF0aWMgY29uc3QgVmVjdG9yPERXT1JELCA0PiYgZ2V0Q0pLQ29kZVBhZ2VNYXNrcygp CiAgICAgc3RhdGljIGJvb2wgaW5pdGlhbGl6ZWQ7CiAgICAgaWYgKCFpbml0aWFsaXplZCkgewog ICAgICAgICBpbml0aWFsaXplZCA9IHRydWU7Ci0jaWYgZGVmaW5lZChJTUxBTkdfRk9OVF9MSU5L KSAmJiAoSU1MQU5HX0ZPTlRfTElOSyA9PSAyKQotICAgICAgICBJTUxhbmdGb250TGluazIqIGxh bmdGb250TGluayA9IGZvbnRDYWNoZSgpLT5nZXRGb250TGlua0ludGVyZmFjZSgpOwotI2Vsc2UK LSAgICAgICAgSU1MYW5nRm9udExpbmsqIGxhbmdGb250TGluayA9IGZvbnRDYWNoZSgpLT5nZXRG b250TGlua0ludGVyZmFjZSgpOwotI2VuZGlmCisgICAgICAgIElNTGFuZ0ZvbnRMaW5rVHlwZSog bGFuZ0ZvbnRMaW5rID0gZm9udENhY2hlKCktPmdldEZvbnRMaW5rSW50ZXJmYWNlKCk7CiAgICAg ICAgIGlmICghbGFuZ0ZvbnRMaW5rKQogICAgICAgICAgICAgcmV0dXJuIGNvZGVQYWdlTWFza3M7 CiAKQEAgLTIzNCwxMiArMjIxLDcgQEAgUGFzc1JlZlB0cjxTaW1wbGVGb250RGF0YT4gRm9udENh Y2hlOjpnZXRGb250RGF0YUZvckNoYXJhY3RlcnMoY29uc3QgRm9udCYgZm9udCwKICAgICBjb25z dCBGb250UGxhdGZvcm1EYXRhJiBvcmlnRm9udCA9IGZvbnQucHJpbWFyeUZvbnQoKS0+Zm9udERh dGFGb3JDaGFyYWN0ZXIoY2hhcmFjdGVyKS0+cGxhdGZvcm1EYXRhKCk7CiAgICAgdW5zaWduZWQg dW5pY29kZVJhbmdlID0gZmluZENoYXJVbmljb2RlUmFuZ2UoY2hhcmFjdGVyKTsKIAotI2lmIGRl ZmluZWQoSU1MQU5HX0ZPTlRfTElOSykgJiYgKElNTEFOR19GT05UX0xJTksgPT0gMikKLSAgICBp ZiAoSU1MYW5nRm9udExpbmsyKiBsYW5nRm9udExpbmsgPSBnZXRGb250TGlua0ludGVyZmFjZSgp KQotI2Vsc2UKLSAgICBpZiAoSU1MYW5nRm9udExpbmsqIGxhbmdGb250TGluayA9IGdldEZvbnRM aW5rSW50ZXJmYWNlKCkpCi0jZW5kaWYKLSAgICB7CisgICAgaWYgKElNTGFuZ0ZvbnRMaW5rVHlw ZSogbGFuZ0ZvbnRMaW5rID0gZ2V0Rm9udExpbmtJbnRlcmZhY2UoKSkgewogICAgICAgICBIR0RJ T0JKIG9sZEZvbnQgPSBHZXRDdXJyZW50T2JqZWN0KGdfc2NyZWVuREMsIE9CSl9GT05UKTsKICAg ICAgICAgSEZPTlQgaGZvbnQgPSAwOwogICAgICAgICBEV09SRCBjb2RlUGFnZXMgPSAwOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvRm9udFBsYXRm b3JtRGF0YS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9Gb250 UGxhdGZvcm1EYXRhLmNwcAppbmRleCA1YTI5NWJiLi4xYTQ4MDYyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9Gb250UGxhdGZvcm1EYXRhLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9Gb250UGxhdGZvcm1E YXRhLmNwcApAQCAtNTQsMTMgKzU0LDggQEAgcHVibGljOgogICAgIERXT1JEIGNvZGVQYWdlcygp IGNvbnN0CiAgICAgewogICAgICAgICBpZiAoIW1fY29kZVBhZ2VzKSB7Ci0jaWYgZGVmaW5lZChJ TUxBTkdfRk9OVF9MSU5LKSAmJiAoSU1MQU5HX0ZPTlRfTElOSyA9PSAyKQotICAgICAgICAgICAg aWYgKElNTGFuZ0ZvbnRMaW5rMiogbGFuZ0ZvbnRMaW5rID0gZm9udENhY2hlKCktPmdldEZvbnRM aW5rSW50ZXJmYWNlKCkpCisgICAgICAgICAgICBpZiAoSU1MYW5nRm9udExpbmtUeXBlKiBsYW5n Rm9udExpbmsgPSBmb250Q2FjaGUoKS0+Z2V0Rm9udExpbmtJbnRlcmZhY2UoKSkKICAgICAgICAg ICAgICAgICBsYW5nRm9udExpbmstPkNvZGVQYWdlVG9Db2RlUGFnZXMobV9jb2RlUGFnZSwgJm1f Y29kZVBhZ2VzKTsKLSNlbHNlCi0gICAgICAgICAgICBpZiAoSU1MYW5nRm9udExpbmsqIGxhbmdG b250TGluayA9IGZvbnRDYWNoZSgpLT5nZXRGb250TGlua0ludGVyZmFjZSgpKQotICAgICAgICAg ICAgICAgIGxhbmdGb250TGluay0+Q29kZVBhZ2VUb0NvZGVQYWdlcyhtX2NvZGVQYWdlLCAmbV9j b2RlUGFnZXMpOwotI2VuZGlmCiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIG1fY29kZVBhZ2Vz OwogICAgIH0KQEAgLTI2OCwxMSArMjYzLDcgQEAgUGFzc1JlZlB0cjxGaXhlZFNpemVGb250RGF0 YT4gRml4ZWRTaXplRm9udERhdGE6OmNyZWF0ZShjb25zdCBBdG9taWNTdHJpbmcmIGZhbWkKIAog ICAgIEdldFRleHRNZXRyaWNzKGdfc2NyZWVuREMsICZmb250RGF0YS0+bV9tZXRyaWNzKTsKIAot I2lmIGRlZmluZWQoSU1MQU5HX0ZPTlRfTElOSykgJiYgKElNTEFOR19GT05UX0xJTksgPT0gMikK LSAgICBpZiAoSU1MYW5nRm9udExpbmsyKiBsYW5nRm9udExpbmsgPSBmb250Q2FjaGUoKS0+Z2V0 Rm9udExpbmtJbnRlcmZhY2UoKSkgewotI2Vsc2UKLSAgICBpZiAoSU1MYW5nRm9udExpbmsqIGxh bmdGb250TGluayA9IGZvbnRDYWNoZSgpLT5nZXRGb250TGlua0ludGVyZmFjZSgpKSB7Ci0jZW5k aWYKKyAgICBpZiAoSU1MYW5nRm9udExpbmtUeXBlKiBsYW5nRm9udExpbmsgPSBmb250Q2FjaGUo KS0+Z2V0Rm9udExpbmtJbnRlcmZhY2UoKSkgewogICAgICAgICBsYW5nRm9udExpbmstPkdldEZv bnRDb2RlUGFnZXMoZ19zY3JlZW5EQywgZm9udERhdGEtPm1faGZvbnQuZ2V0KCksICZmb250RGF0 YS0+bV9jb2RlUGFnZXMpOwogICAgICAgICBmb250RGF0YS0+bV9jb2RlUGFnZXMgfD0gRm9udFBs YXRmb3JtRGF0YTo6Z2V0S25vd25Gb250Q29kZVBhZ2VzKHdpbkZvbnQubGZGYWNlTmFtZSk7CiAg ICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2Uv R2x5cGhQYWdlVHJlZU5vZGVXaW5DRS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy93aW5jZS9HbHlwaFBhZ2VUcmVlTm9kZVdpbkNFLmNwcAppbmRleCAxYzIyZjIzLi5kZDY3 YzdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9H bHlwaFBhZ2VUcmVlTm9kZVdpbkNFLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy93aW5jZS9HbHlwaFBhZ2VUcmVlTm9kZVdpbkNFLmNwcApAQCAtNTEsMTEgKzUxLDcg QEAgYm9vbCBHbHlwaFBhZ2U6OmZpbGwodW5zaWduZWQgb2Zmc2V0LCB1bnNpZ25lZCBsZW5ndGgs IFVDaGFyKiBidWZmZXIsIHVuc2lnbmVkIGIKICAgICAgICAgICAgICAgICAgICAgICAgIHNldEds eXBoRGF0YUZvckluZGV4KG9mZnNldCArIGksIGJ1ZmZlcltpXSwgMCk7CiAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwotI2lmIGRlZmluZWQoSU1MQU5HX0ZP TlRfTElOSykgJiYgKElNTEFOR19GT05UX0xJTksgPT0gMikKLSAgICAgICAgICAgIH0gZWxzZSBp ZiAoSU1MYW5nRm9udExpbmsyKiBsYW5nRm9udExpbmsgPSBmb250Q2FjaGUoKS0+Z2V0Rm9udExp bmtJbnRlcmZhY2UoKSkgewotI2Vsc2UKLSAgICAgICAgICAgIH0gZWxzZSBpZiAoSU1MYW5nRm9u dExpbmsqIGxhbmdGb250TGluayA9IGZvbnRDYWNoZSgpLT5nZXRGb250TGlua0ludGVyZmFjZSgp KSB7Ci0jZW5kaWYKKyAgICAgICAgICAgIH0gZWxzZSBpZiAoSU1MYW5nRm9udExpbmtUeXBlKiBs YW5nRm9udExpbmsgPSBmb250Q2FjaGUoKS0+Z2V0Rm9udExpbmtJbnRlcmZhY2UoKSkgewogICAg ICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBidWZmZXJMZW5ndGg7ICsraSkg ewogICAgICAgICAgICAgICAgICAgICBEV09SRCBhY3R1YWxDb2RlUGFnZXM7CiAgICAgICAgICAg ICAgICAgICAgIGxhbmdGb250TGluay0+R2V0Q2hhckNvZGVQYWdlcyhidWZmZXJbaV0sICZhY3R1 YWxDb2RlUGFnZXMpOwo=