37473 2010-04-12 16:15:18 -0700 WebKit should have more robust last-chance font fallback on Windows 2010-04-12 17:48:14 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sfalken webkit-unassigned oldest_to_newest 211744 0 sfalken 2010-04-12 16:15:18 -0700 WebKit should have more robust last-chance font fallback on Windows 211766 1 53198 sfalken 2010-04-12 16:41:12 -0700 Created attachment 53198 Patch 211770 2 53199 sfalken 2010-04-12 16:45:22 -0700 Created attachment 53199 Patch 211774 3 53199 mitz 2010-04-12 17:00:12 -0700 Comment on attachment 53199 Patch > +#if PLATFORM(WIN) > + SimpleFontData* FontCache::fontDataFromDescriptionAndLogFont(const FontDescription&, const LOGFONT&); > +#endif I’d avoid this method and replace it with a file-static function that takes a FontCache*, but r=me either way. 211792 4 sfalken 2010-04-12 17:48:14 -0700 Committed r57490: <http://trac.webkit.org/changeset/57490> 53198 2010-04-12 16:41:12 -0700 2010-04-12 16:45:19 -0700 Patch bug-37473-20100412164025.patch text/plain 5694 sfalken SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzQ4NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTAtMDQtMTIgIFN0ZXZlIEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXZWJLaXQgc2hvdWxkIGhhdmUgbW9yZSByb2J1c3QgbGFzdC1jaGFuY2UgZm9udCBmYWxsYmFj ayBvbiBXaW5kb3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zNzQ3MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzc4OTQzOD4gQ3Jhc2ggaW4gRm9u dEZhbGxiYWNrTGlzdDo6ZGV0ZXJtaW5lUGl0Y2gKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcy MzM3NjI+IENyYXNoIGluIEZvbnRGYWxsYmFja0xpc3Q6OmZvbnREYXRhQXQKKyAgICAgICAgCisg ICAgICAgIExvb2sgaGFyZGVyIGZvciBhIHN1aXRhYmxlIGxhc3QtcmVzb3J0IGZvbnQuIFByZXZp b3VzbHksIHdlIGNoZWNrZWQgZm9yCisgICAgICAgICJUaW1lcyBOZXcgUm9tYW4iIGZvbGxvd2Vk IGJ5IERFRkFVTFRfR1VJX0ZPTlQuCisgICAgICAgIAorICAgICAgICBXZSBub3cgbG9vayBmb3I6 CisgICAgICAgIC0gVHlwaWNhbGx5IGluc3RhbGxlZCBVbmljb2RlLWNhcGFibGUgZm9udHMsIGlu IG9yZGVyIG9mIGNvdmVyYWdlCisgICAgICAgIC0gREVGQVVMVF9HVUlfRk9OVAorICAgICAgICAt IFNQSV9HRVROT05DTElFTlRNRVRSSUNTIGZvbnRzCisgICAgICAgIAorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dp bi9Gb250Q2FjaGVXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpmb250RGF0 YUZyb21EZXNjcmlwdGlvbkFuZExvZ0ZvbnQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hl OjpnZXRMYXN0UmVzb3J0RmFsbGJhY2tGb250KToKKwogMjAxMC0wNC0xMiAgRGF2aWQgSHlhdHQg IDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4K SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaAkocmV2aXNpb24gNTc0ODQp CisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCSh3b3JraW5nIGNvcHkp CkBAIC03OCw2ICs3OCwxMCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGdldFRyYWl0c0luRmFtaWx5 KGNvbnN0IEF0b21pY1N0cmluZyYsIFZlY3Rvcjx1bnNpZ25lZD4mKTsKIAorI2lmIFBMQVRGT1JN KFdJTikKKyAgICBTaW1wbGVGb250RGF0YSogRm9udENhY2hlOjpmb250RGF0YUZyb21EZXNjcmlw dGlvbkFuZExvZ0ZvbnQoY29uc3QgRm9udERlc2NyaXB0aW9uJiwgY29uc3QgTE9HRk9OVCYpOwor I2VuZGlmCisKICAgICBTaW1wbGVGb250RGF0YSogZ2V0Q2FjaGVkRm9udERhdGEoY29uc3QgRm9u dERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5 LCBib29sIGNoZWNraW5nQWx0ZXJuYXRlTmFtZSA9IGZhbHNlKTsKICAgICBTaW1wbGVGb250RGF0 YSogZ2V0TGFzdFJlc29ydEZhbGxiYWNrRm9udChjb25zdCBGb250RGVzY3JpcHRpb24mKTsKIApJ bmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udENhY2hlV2luLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3Bw CShyZXZpc2lvbiA1NzQ4NCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRD YWNoZVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMwMSwyMiArMzAxLDYyIEBAIFNpbXBsZUZv bnREYXRhKiBGb250Q2FjaGU6OmdldFNpbWlsYXJGb24KICAgICByZXR1cm4gMDsKIH0KIAorU2lt cGxlRm9udERhdGEqIEZvbnRDYWNoZTo6Zm9udERhdGFGcm9tRGVzY3JpcHRpb25BbmRMb2dGb250 KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBjb25zdCBMT0dGT05UJiBm b250KQoreworICAgIFN0cmluZyBmb250RmFtaWx5ID0gU3RyaW5nKGZvbnQubGZGYWNlTmFtZSwg d2Nzbmxlbihmb250LmxmRmFjZU5hbWUsIExGX0ZBQ0VTSVpFKSk7CisgICAgcmV0dXJuIGdldENh Y2hlZEZvbnREYXRhKGZvbnREZXNjcmlwdGlvbiwgZm9udEZhbWlseSk7Cit9CisKIFNpbXBsZUZv bnREYXRhKiBGb250Q2FjaGU6OmdldExhc3RSZXNvcnRGYWxsYmFja0ZvbnQoY29uc3QgRm9udERl c2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24pCiB7CisgICAgREVGSU5FX1NUQVRJQ19MT0NBTChT aW1wbGVGb250RGF0YSosIHNpbXBsZUZvbnQsICgpKTsKKyAgICBpZiAoc2ltcGxlRm9udCkKKyAg ICAgICAgcmV0dXJuIHNpbXBsZUZvbnQ7CisKICAgICAvLyBGSVhNRTogV291bGQgYmUgZXZlbiBi ZXR0ZXIgdG8gc29tZWhvdyBnZXQgdGhlIHVzZXIncyBkZWZhdWx0IGZvbnQgaGVyZS4gIEZvciBu b3cgd2UnbGwgcGljawogICAgIC8vIHRoZSBkZWZhdWx0IHRoYXQgdGhlIHVzZXIgd291bGQgZ2V0 IHdpdGhvdXQgY2hhbmdpbmcgYW55IHByZWZzLgotICAgIHN0YXRpYyBBdG9taWNTdHJpbmcgdGlt ZXNTdHIoIlRpbWVzIE5ldyBSb21hbiIpOwotICAgIGlmIChTaW1wbGVGb250RGF0YSogc2ltcGxl Rm9udCA9IGdldENhY2hlZEZvbnREYXRhKGZvbnREZXNjcmlwdGlvbiwgdGltZXNTdHIpKQotICAg ICAgICByZXR1cm4gc2ltcGxlRm9udDsKIAotICAgIERFRklORV9TVEFUSUNfTE9DQUwoU3RyaW5n LCBkZWZhdWx0R1VJRm9udEZhbWlseSwgKCkpOwotICAgIGlmIChkZWZhdWx0R1VJRm9udEZhbWls eS5pc0VtcHR5KCkpIHsKLSAgICAgICAgSEZPTlQgZGVmYXVsdEdVSUZvbnQgPSBzdGF0aWNfY2Fz dDxIRk9OVD4oR2V0U3RvY2tPYmplY3QoREVGQVVMVF9HVUlfRk9OVCkpOwotICAgICAgICBMT0dG T05UIGxvZ0ZvbnQ7Ci0gICAgICAgIEdldE9iamVjdChkZWZhdWx0R1VJRm9udCwgc2l6ZW9mKGxv Z0ZvbnQpLCAmbG9nRm9udCk7Ci0gICAgICAgIGRlZmF1bHRHVUlGb250RmFtaWx5ID0gU3RyaW5n KGxvZ0ZvbnQubGZGYWNlTmFtZSwgd2Nzbmxlbihsb2dGb250LmxmRmFjZU5hbWUsIExGX0ZBQ0VT SVpFKSk7CisgICAgLy8gU2VhcmNoIGFsbCB0eXBpY2FsIFdpbmRvd3MtaW5zdGFsbGVkIGZ1bGwg VW5pY29kZSBmb250cy4KKyAgICAvLyBTb3J0ZWQgYnkgbW9zdCB0byBsZWFzdCBnbHlwaHMgYWNj b3JkaW5nIHRvIGh0dHA6Ly9lbi53aWtpcGVkaWEub3JnL3dpa2kvVW5pY29kZV90eXBlZmFjZXMK KyAgICAvLyBTdGFydCB3aXRoIFRpbWVzIE5ldyBSb21hbiBhbHNvIHNpbmNlIGl0IGlzIHRoZSBk ZWZhdWx0IGlmIHRoZSB1c2VyIGRvZXNuJ3QgY2hhbmdlIHByZWZzLgorICAgIHN0YXRpYyBBdG9t aWNTdHJpbmcgZmFsbGJhY2tGb250c1tdID0geworICAgICAgICBBdG9taWNTdHJpbmcoIlRpbWVz IE5ldyBSb21hbiIpLAorICAgICAgICBBdG9taWNTdHJpbmcoIk1pY3Jvc29mdCBTYW5zIFNlcmlm IiksCisgICAgICAgIEF0b21pY1N0cmluZygiVGFob21hIiksCisgICAgICAgIEF0b21pY1N0cmlu ZygiTHVjaWRhIFNhbnMgVW5pY29kZSIpLAorICAgICAgICBBdG9taWNTdHJpbmcoIkFyaWFsIikK KyAgICB9OworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgQVJSQVlTSVpFKGZhbGxiYWNrRm9udHMp OyArK2kpIHsKKyAgICAgICAgaWYgKHNpbXBsZUZvbnQgPSBnZXRDYWNoZWRGb250RGF0YShmb250 RGVzY3JpcHRpb24sIGZhbGxiYWNrRm9udHNbaV0pKQorICAgICAgICAgICAgcmV0dXJuIHNpbXBs ZUZvbnQ7CisgICAgfQorCisgICAgLy8gRmFsbCBiYWNrIHRvIHRoZSBERUZBVUxUX0dVSV9GT05U IGlmIG5vIGtub3duIFVuaWNvZGUgZm9udHMgYXJlIGF2YWlsYWJsZS4KKyAgICBpZiAoSEZPTlQg ZGVmYXVsdEdVSUZvbnQgPSBzdGF0aWNfY2FzdDxIRk9OVD4oR2V0U3RvY2tPYmplY3QoREVGQVVM VF9HVUlfRk9OVCkpKSB7CisgICAgICAgIExPR0ZPTlQgZGVmYXVsdEdVSUxvZ0ZvbnQ7CisgICAg ICAgIEdldE9iamVjdChkZWZhdWx0R1VJRm9udCwgc2l6ZW9mKGRlZmF1bHRHVUlMb2dGb250KSwg JmRlZmF1bHRHVUlMb2dGb250KTsKKyAgICAgICAgaWYgKHNpbXBsZUZvbnQgPSBmb250RGF0YUZy b21EZXNjcmlwdGlvbkFuZExvZ0ZvbnQoZm9udERlc2NyaXB0aW9uLCBkZWZhdWx0R1VJTG9nRm9u dCkpCisgICAgICAgICAgICByZXR1cm4gc2ltcGxlRm9udDsKICAgICB9Ci0gICAgcmV0dXJuIGdl dENhY2hlZEZvbnREYXRhKGZvbnREZXNjcmlwdGlvbiwgZGVmYXVsdEdVSUZvbnRGYW1pbHkpOwor CisgICAgLy8gRmFsbCBiYWNrIHRvIE5vbi1jbGllbnQgbWV0cmljcyBmb250cy4KKyAgICBOT05D TElFTlRNRVRSSUNTIG5vbkNsaWVudE1ldHJpY3MgPSB7MH07CisgICAgbm9uQ2xpZW50TWV0cmlj cy5jYlNpemUgPSBzaXplb2Yobm9uQ2xpZW50TWV0cmljcyk7CisgICAgaWYgKFN5c3RlbVBhcmFt ZXRlcnNJbmZvKFNQSV9HRVROT05DTElFTlRNRVRSSUNTLCBzaXplb2Yobm9uQ2xpZW50TWV0cmlj cyksICZub25DbGllbnRNZXRyaWNzLCAwKSkgeworICAgICAgICBpZiAoc2ltcGxlRm9udCA9IGZv bnREYXRhRnJvbURlc2NyaXB0aW9uQW5kTG9nRm9udChmb250RGVzY3JpcHRpb24sIG5vbkNsaWVu dE1ldHJpY3MubGZNZXNzYWdlRm9udCkpCisgICAgICAgICAgICByZXR1cm4gc2ltcGxlRm9udDsK KyAgICAgICAgaWYgKHNpbXBsZUZvbnQgPSBmb250RGF0YUZyb21EZXNjcmlwdGlvbkFuZExvZ0Zv bnQoZm9udERlc2NyaXB0aW9uLCBub25DbGllbnRNZXRyaWNzLmxmTWVudUZvbnQpKQorICAgICAg ICAgICAgcmV0dXJuIHNpbXBsZUZvbnQ7CisgICAgICAgIGlmIChzaW1wbGVGb250ID0gZm9udERh dGFGcm9tRGVzY3JpcHRpb25BbmRMb2dGb250KGZvbnREZXNjcmlwdGlvbiwgbm9uQ2xpZW50TWV0 cmljcy5sZlN0YXR1c0ZvbnQpKQorICAgICAgICAgICAgcmV0dXJuIHNpbXBsZUZvbnQ7CisgICAg ICAgIGlmIChzaW1wbGVGb250ID0gZm9udERhdGFGcm9tRGVzY3JpcHRpb25BbmRMb2dGb250KGZv bnREZXNjcmlwdGlvbiwgbm9uQ2xpZW50TWV0cmljcy5sZkNhcHRpb25Gb250KSkKKyAgICAgICAg ICAgIHJldHVybiBzaW1wbGVGb250OworICAgICAgICBpZiAoc2ltcGxlRm9udCA9IGZvbnREYXRh RnJvbURlc2NyaXB0aW9uQW5kTG9nRm9udChmb250RGVzY3JpcHRpb24sIG5vbkNsaWVudE1ldHJp Y3MubGZTbUNhcHRpb25Gb250KSkKKyAgICAgICAgICAgIHJldHVybiBzaW1wbGVGb250OworICAg IH0KKyAgICAKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gMDsKIH0KIAog c3RhdGljIExPTkcgdG9HRElGb250V2VpZ2h0KEZvbnRXZWlnaHQgZm9udFdlaWdodCkK 53199 2010-04-12 16:45:22 -0700 2010-04-12 17:00:12 -0700 Patch bug-37473-20100412164435.patch text/plain 5694 sfalken SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzQ4NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTAtMDQtMTIgIFN0ZXZlIEZhbGtlbmJ1cmcgIDxzZmFsa2VuQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXZWJLaXQgc2hvdWxkIGhhdmUgbW9yZSByb2J1c3QgbGFzdC1jaGFuY2UgZm9udCBmYWxsYmFj ayBvbiBXaW5kb3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zNzQ3MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzc4OTQzOD4gQ3Jhc2ggaW4gRm9u dEZhbGxiYWNrTGlzdDo6ZGV0ZXJtaW5lUGl0Y2gKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzcy MzM3NjI+IENyYXNoIGluIEZvbnRGYWxsYmFja0xpc3Q6OmZvbnREYXRhQXQKKyAgICAgICAgCisg ICAgICAgIExvb2sgaGFyZGVyIGZvciBhIHN1aXRhYmxlIGxhc3QtcmVzb3J0IGZvbnQuIFByZXZp b3VzbHksIHdlIGNoZWNrZWQgZm9yCisgICAgICAgICJUaW1lcyBOZXcgUm9tYW4iIGZvbGxvd2Vk IGJ5IERFRkFVTFRfR1VJX0ZPTlQuCisgICAgICAgIAorICAgICAgICBXZSBub3cgbG9vayBmb3I6 CisgICAgICAgIC0gVHlwaWNhbGx5IGluc3RhbGxlZCBVbmljb2RlLWNhcGFibGUgZm9udHMsIGlu IG9yZGVyIG9mIGNvdmVyYWdlCisgICAgICAgIC0gREVGQVVMVF9HVUlfRk9OVAorICAgICAgICAt IFNQSV9HRVROT05DTElFTlRNRVRSSUNTIGZvbnRzCisgICAgICAgIAorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dp bi9Gb250Q2FjaGVXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpmb250RGF0 YUZyb21EZXNjcmlwdGlvbkFuZExvZ0ZvbnQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hl OjpnZXRMYXN0UmVzb3J0RmFsbGJhY2tGb250KToKKwogMjAxMC0wNC0xMiAgRGF2aWQgSHlhdHQg IDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4K SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhY2hlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FjaGUuaAkocmV2aXNpb24gNTc0ODQp CisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYWNoZS5oCSh3b3JraW5nIGNvcHkp CkBAIC03OCw2ICs3OCwxMCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGdldFRyYWl0c0luRmFtaWx5 KGNvbnN0IEF0b21pY1N0cmluZyYsIFZlY3Rvcjx1bnNpZ25lZD4mKTsKIAorI2lmIFBMQVRGT1JN KFdJTikKKyAgICBTaW1wbGVGb250RGF0YSogRm9udENhY2hlOjpmb250RGF0YUZyb21EZXNjcmlw dGlvbkFuZExvZ0ZvbnQoY29uc3QgRm9udERlc2NyaXB0aW9uJiwgY29uc3QgTE9HRk9OVCYpOwor I2VuZGlmCisKICAgICBTaW1wbGVGb250RGF0YSogZ2V0Q2FjaGVkRm9udERhdGEoY29uc3QgRm9u dERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24sIGNvbnN0IEF0b21pY1N0cmluZyYgZmFtaWx5 LCBib29sIGNoZWNraW5nQWx0ZXJuYXRlTmFtZSA9IGZhbHNlKTsKICAgICBTaW1wbGVGb250RGF0 YSogZ2V0TGFzdFJlc29ydEZhbGxiYWNrRm9udChjb25zdCBGb250RGVzY3JpcHRpb24mKTsKIApJ bmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udENhY2hlV2luLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q2FjaGVXaW4uY3Bw CShyZXZpc2lvbiA1NzQ4NCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRD YWNoZVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMwMSwyMiArMzAxLDYyIEBAIFNpbXBsZUZv bnREYXRhKiBGb250Q2FjaGU6OmdldFNpbWlsYXJGb24KICAgICByZXR1cm4gMDsKIH0KIAorU2lt cGxlRm9udERhdGEqIEZvbnRDYWNoZTo6Zm9udERhdGFGcm9tRGVzY3JpcHRpb25BbmRMb2dGb250 KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0aW9uLCBjb25zdCBMT0dGT05UJiBm b250KQoreworICAgIFN0cmluZyBmb250RmFtaWx5ID0gU3RyaW5nKGZvbnQubGZGYWNlTmFtZSwg d2Nzbmxlbihmb250LmxmRmFjZU5hbWUsIExGX0ZBQ0VTSVpFKSk7CisgICAgcmV0dXJuIGdldENh Y2hlZEZvbnREYXRhKGZvbnREZXNjcmlwdGlvbiwgZm9udEZhbWlseSk7Cit9CisKIFNpbXBsZUZv bnREYXRhKiBGb250Q2FjaGU6OmdldExhc3RSZXNvcnRGYWxsYmFja0ZvbnQoY29uc3QgRm9udERl c2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24pCiB7CisgICAgREVGSU5FX1NUQVRJQ19MT0NBTChT aW1wbGVGb250RGF0YSosIHNpbXBsZUZvbnQsICgpKTsKKyAgICBpZiAoc2ltcGxlRm9udCkKKyAg ICAgICAgcmV0dXJuIHNpbXBsZUZvbnQ7CisKICAgICAvLyBGSVhNRTogV291bGQgYmUgZXZlbiBi ZXR0ZXIgdG8gc29tZWhvdyBnZXQgdGhlIHVzZXIncyBkZWZhdWx0IGZvbnQgaGVyZS4gIEZvciBu b3cgd2UnbGwgcGljawogICAgIC8vIHRoZSBkZWZhdWx0IHRoYXQgdGhlIHVzZXIgd291bGQgZ2V0 IHdpdGhvdXQgY2hhbmdpbmcgYW55IHByZWZzLgotICAgIHN0YXRpYyBBdG9taWNTdHJpbmcgdGlt ZXNTdHIoIlRpbWVzIE5ldyBSb21hbiIpOwotICAgIGlmIChTaW1wbGVGb250RGF0YSogc2ltcGxl Rm9udCA9IGdldENhY2hlZEZvbnREYXRhKGZvbnREZXNjcmlwdGlvbiwgdGltZXNTdHIpKQotICAg ICAgICByZXR1cm4gc2ltcGxlRm9udDsKIAotICAgIERFRklORV9TVEFUSUNfTE9DQUwoU3RyaW5n LCBkZWZhdWx0R1VJRm9udEZhbWlseSwgKCkpOwotICAgIGlmIChkZWZhdWx0R1VJRm9udEZhbWls eS5pc0VtcHR5KCkpIHsKLSAgICAgICAgSEZPTlQgZGVmYXVsdEdVSUZvbnQgPSBzdGF0aWNfY2Fz dDxIRk9OVD4oR2V0U3RvY2tPYmplY3QoREVGQVVMVF9HVUlfRk9OVCkpOwotICAgICAgICBMT0dG T05UIGxvZ0ZvbnQ7Ci0gICAgICAgIEdldE9iamVjdChkZWZhdWx0R1VJRm9udCwgc2l6ZW9mKGxv Z0ZvbnQpLCAmbG9nRm9udCk7Ci0gICAgICAgIGRlZmF1bHRHVUlGb250RmFtaWx5ID0gU3RyaW5n KGxvZ0ZvbnQubGZGYWNlTmFtZSwgd2Nzbmxlbihsb2dGb250LmxmRmFjZU5hbWUsIExGX0ZBQ0VT SVpFKSk7CisgICAgLy8gU2VhcmNoIGFsbCB0eXBpY2FsIFdpbmRvd3MtaW5zdGFsbGVkIGZ1bGwg VW5pY29kZSBmb250cy4KKyAgICAvLyBTb3J0ZWQgYnkgbW9zdCB0byBsZWFzdCBnbHlwaHMgYWNj b3JkaW5nIHRvIGh0dHA6Ly9lbi53aWtpcGVkaWEub3JnL3dpa2kvVW5pY29kZV90eXBlZmFjZXMK KyAgICAvLyBTdGFydCB3aXRoIFRpbWVzIE5ldyBSb21hbiBhbHNvIHNpbmNlIGl0IGlzIHRoZSBk ZWZhdWx0IGlmIHRoZSB1c2VyIGRvZXNuJ3QgY2hhbmdlIHByZWZzLgorICAgIHN0YXRpYyBBdG9t aWNTdHJpbmcgZmFsbGJhY2tGb250c1tdID0geworICAgICAgICBBdG9taWNTdHJpbmcoIlRpbWVz IE5ldyBSb21hbiIpLAorICAgICAgICBBdG9taWNTdHJpbmcoIk1pY3Jvc29mdCBTYW5zIFNlcmlm IiksCisgICAgICAgIEF0b21pY1N0cmluZygiVGFob21hIiksCisgICAgICAgIEF0b21pY1N0cmlu ZygiTHVjaWRhIFNhbnMgVW5pY29kZSIpLAorICAgICAgICBBdG9taWNTdHJpbmcoIkFyaWFsIikK KyAgICB9OworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgQVJSQVlTSVpFKGZhbGxiYWNrRm9udHMp OyArK2kpIHsKKyAgICAgICAgaWYgKHNpbXBsZUZvbnQgPSBnZXRDYWNoZWRGb250RGF0YShmb250 RGVzY3JpcHRpb24sIGZhbGxiYWNrRm9udHNbaV0pKQorICAgICAgICAgICAgcmV0dXJuIHNpbXBs ZUZvbnQ7CisgICAgfQorCisgICAgLy8gRmFsbCBiYWNrIHRvIHRoZSBERUZBVUxUX0dVSV9GT05U IGlmIG5vIGtub3duIFVuaWNvZGUgZm9udHMgYXJlIGF2YWlsYWJsZS4KKyAgICBpZiAoSEZPTlQg ZGVmYXVsdEdVSUZvbnQgPSBzdGF0aWNfY2FzdDxIRk9OVD4oR2V0U3RvY2tPYmplY3QoREVGQVVM VF9HVUlfRk9OVCkpKSB7CisgICAgICAgIExPR0ZPTlQgZGVmYXVsdEdVSUxvZ0ZvbnQ7CisgICAg ICAgIEdldE9iamVjdChkZWZhdWx0R1VJRm9udCwgc2l6ZW9mKGRlZmF1bHRHVUlMb2dGb250KSwg JmRlZmF1bHRHVUlMb2dGb250KTsKKyAgICAgICAgaWYgKHNpbXBsZUZvbnQgPSBmb250RGF0YUZy b21EZXNjcmlwdGlvbkFuZExvZ0ZvbnQoZm9udERlc2NyaXB0aW9uLCBkZWZhdWx0R1VJTG9nRm9u dCkpCisgICAgICAgICAgICByZXR1cm4gc2ltcGxlRm9udDsKICAgICB9Ci0gICAgcmV0dXJuIGdl dENhY2hlZEZvbnREYXRhKGZvbnREZXNjcmlwdGlvbiwgZGVmYXVsdEdVSUZvbnRGYW1pbHkpOwor CisgICAgLy8gRmFsbCBiYWNrIHRvIE5vbi1jbGllbnQgbWV0cmljcyBmb250cy4KKyAgICBOT05D TElFTlRNRVRSSUNTIG5vbkNsaWVudE1ldHJpY3MgPSB7MH07CisgICAgbm9uQ2xpZW50TWV0cmlj cy5jYlNpemUgPSBzaXplb2Yobm9uQ2xpZW50TWV0cmljcyk7CisgICAgaWYgKFN5c3RlbVBhcmFt ZXRlcnNJbmZvKFNQSV9HRVROT05DTElFTlRNRVRSSUNTLCBzaXplb2Yobm9uQ2xpZW50TWV0cmlj cyksICZub25DbGllbnRNZXRyaWNzLCAwKSkgeworICAgICAgICBpZiAoc2ltcGxlRm9udCA9IGZv bnREYXRhRnJvbURlc2NyaXB0aW9uQW5kTG9nRm9udChmb250RGVzY3JpcHRpb24sIG5vbkNsaWVu dE1ldHJpY3MubGZNZXNzYWdlRm9udCkpCisgICAgICAgICAgICByZXR1cm4gc2ltcGxlRm9udDsK KyAgICAgICAgaWYgKHNpbXBsZUZvbnQgPSBmb250RGF0YUZyb21EZXNjcmlwdGlvbkFuZExvZ0Zv bnQoZm9udERlc2NyaXB0aW9uLCBub25DbGllbnRNZXRyaWNzLmxmTWVudUZvbnQpKQorICAgICAg ICAgICAgcmV0dXJuIHNpbXBsZUZvbnQ7CisgICAgICAgIGlmIChzaW1wbGVGb250ID0gZm9udERh dGFGcm9tRGVzY3JpcHRpb25BbmRMb2dGb250KGZvbnREZXNjcmlwdGlvbiwgbm9uQ2xpZW50TWV0 cmljcy5sZlN0YXR1c0ZvbnQpKQorICAgICAgICAgICAgcmV0dXJuIHNpbXBsZUZvbnQ7CisgICAg ICAgIGlmIChzaW1wbGVGb250ID0gZm9udERhdGFGcm9tRGVzY3JpcHRpb25BbmRMb2dGb250KGZv bnREZXNjcmlwdGlvbiwgbm9uQ2xpZW50TWV0cmljcy5sZkNhcHRpb25Gb250KSkKKyAgICAgICAg ICAgIHJldHVybiBzaW1wbGVGb250OworICAgICAgICBpZiAoc2ltcGxlRm9udCA9IGZvbnREYXRh RnJvbURlc2NyaXB0aW9uQW5kTG9nRm9udChmb250RGVzY3JpcHRpb24sIG5vbkNsaWVudE1ldHJp Y3MubGZTbUNhcHRpb25Gb250KSkKKyAgICAgICAgICAgIHJldHVybiBzaW1wbGVGb250OworICAg IH0KKyAgICAKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gMDsKIH0KIAog c3RhdGljIExPTkcgdG9HRElGb250V2VpZ2h0KEZvbnRXZWlnaHQgZm9udFdlaWdodCkK