39365 2010-05-19 10:18:50 -0700 wx port: font fallback issues on 2.8 2010-05-19 12:19:36 -0700 1 1 1 Unclassified WebKit WebKit wx 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 0 kevinwatters webkit-unassigned kevino oldest_to_newest 227869 0 56498 kevinwatters 2010-05-19 10:18:50 -0700 Created attachment 56498 Add some logic for matching "Arabic" and other keywords in getSimilarFontPlatformData Fallback fonts should be a bit smarter about matching Arabic fonts to Geeza Pro. 227942 1 kevino 2010-05-19 12:19:36 -0700 Landed in r59780, thanks! 56498 2010-05-19 10:18:50 -0700 2010-05-19 11:38:30 -0700 Add some logic for matching "Arabic" and other keywords in getSimilarFontPlatformData nsfontfix.patch text/plain 3678 kevinwatters SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1OTc2NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDUtMTkgIEtldmluIFdhdHRlcnMgIDxrZXZpbndhdHRlcnNA Z21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFt3eF0gRW5zdXJlIG1fbnNGb250IGlzIGluaXRpYWxpemVkIHByb3Blcmx5LCBhbmQgdHdl YWsgZmFsbGJhY2sgZm9udCBoYW5kbGluZworICAgICAgICB0byBoYW5kbGUgbW9yZSBjYXNlcy4K KyAgICAgICAgCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd3gvRm9udENhY2hlV3guY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpnZXRGb250RGF0YUZvckNoYXJhY3RlcnMp OgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpnZXRTaW1pbGFyRm9udFBsYXRmb3JtRGF0 YSk6CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OmdldExhc3RSZXNvcnRGYWxsYmFja0Zv bnQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3d4L0ZvbnRQbGF0Zm9ybURhdGFXeC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRh KToKKwogMjAxMC0wNS0xOSAgQW5kcmVhcyBLbGluZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgpJbmRleDogV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy93eC9Gb250Q2FjaGVXeC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy93eC9Gb250Q2FjaGVXeC5jcHAJKHJldmlzaW9uIDU5NzY2KQor KysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93eC9Gb250Q2FjaGVXeC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTQ4LDEzICs0OCwzMyBAQAogICAgIGlmICghZm9udERhdGEtPmNvbnRhaW5zQ2hh cmFjdGVycyhjaGFyYWN0ZXJzLCBsZW5ndGgpKQogICAgICAgICBmb250RGF0YSA9IGdldExhc3RS ZXNvcnRGYWxsYmFja0ZvbnQoZm9udC5mb250RGVzY3JpcHRpb24oKSk7CiAgICAgCi0gICAgQVNT RVJUKGZvbnREYXRhLT5jb250YWluc0NoYXJhY3RlcnMoY2hhcmFjdGVycywgbGVuZ3RoKSk7Cisg ICAgQVNTRVJUKGZvbnREYXRhKTsKICAgICByZXR1cm4gZm9udERhdGE7CiB9CiAKIFNpbXBsZUZv bnREYXRhKiBGb250Q2FjaGU6OmdldFNpbWlsYXJGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnQm IGZvbnQpCiB7Ci0gICAgcmV0dXJuIGdldENhY2hlZEZvbnREYXRhKGZvbnQuZm9udERlc2NyaXB0 aW9uKCksIGZvbnQuZmFtaWx5KCkuZmFtaWx5KCkpOworICAgIFNpbXBsZUZvbnREYXRhKiBzaW1w bGVGb250RGF0YSA9IDA7CisjaWYgT1MoREFSV0lOKQorICAgIC8vIEF0dGVtcHQgdG8gZmluZCBh biBhcHByb3ByaWF0ZSBmb250IHVzaW5nIGEgbWF0Y2ggYmFzZWQgb24gCisgICAgLy8gdGhlIHBy ZXNlbmNlIG9mIGtleXdvcmRzIGluIHRoZSB0aGUgcmVxdWVzdGVkIG5hbWVzLiAgRm9yIGV4YW1w bGUsIHdlJ2xsCisgICAgLy8gbWF0Y2ggYW55IG5hbWUgdGhhdCBjb250YWlucyAiQXJhYmljIiB0 byBHZWV6YSBQcm8uCisgICAgY29uc3QgRm9udEZhbWlseSogY3VyckZhbWlseSA9ICZmb250LmZv bnREZXNjcmlwdGlvbigpLmZhbWlseSgpOworICAgIHdoaWxlIChjdXJyRmFtaWx5ICYmICFzaW1w bGVGb250RGF0YSkgeworICAgICAgICBpZiAoY3VyckZhbWlseS0+ZmFtaWx5KCkubGVuZ3RoKCkp IHsKKyAgICAgICAgICAgIHN0YXRpYyBTdHJpbmcqIG1hdGNoV29yZHNbM10gPSB7IG5ldyBTdHJp bmcoIkFyYWJpYyIpLCBuZXcgU3RyaW5nKCJQYXNodG8iKSwgbmV3IFN0cmluZygiVXJkdSIpIH07 CisgICAgICAgICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywgZ2VlemFTdHIs ICgiR2VlemEgUHJvIikpOworICAgICAgICAgICAgZm9yIChpbnQgaiA9IDA7IGogPCAzICYmICFz aW1wbGVGb250RGF0YTsgKytqKQorICAgICAgICAgICAgICAgIGlmIChjdXJyRmFtaWx5LT5mYW1p bHkoKS5jb250YWlucygqbWF0Y2hXb3Jkc1tqXSwgZmFsc2UpKQorICAgICAgICAgICAgICAgICAg ICBzaW1wbGVGb250RGF0YSA9IGdldENhY2hlZEZvbnREYXRhKGZvbnQuZm9udERlc2NyaXB0aW9u KCksIGdlZXphU3RyKTsKKyAgICAgICAgfQorICAgICAgICBjdXJyRmFtaWx5ID0gY3VyckZhbWls eS0+bmV4dCgpOworICAgIH0KKyNlbmRpZgorICAgIGlmICghc2ltcGxlRm9udERhdGEpCisgICAg ICAgIHNpbXBsZUZvbnREYXRhID0gZ2V0Q2FjaGVkRm9udERhdGEoZm9udC5mb250RGVzY3JpcHRp b24oKSwgZm9udC5mYW1pbHkoKS5mYW1pbHkoKSk7CisKKyAgICByZXR1cm4gc2ltcGxlRm9udERh dGE7CiB9CiAKIFNpbXBsZUZvbnREYXRhKiBGb250Q2FjaGU6OmdldExhc3RSZXNvcnRGYWxsYmFj a0ZvbnQoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24pCkBAIC02MiwxMiAr ODIsMTMgQEAKICAgICAvLyBGSVhNRTogV291bGQgYmUgZXZlbiBiZXR0ZXIgdG8gc29tZWhvdyBn ZXQgdGhlIHVzZXIncyBkZWZhdWx0IGZvbnQgaGVyZS4gIEZvciBub3cgd2UnbGwgcGljawogICAg IC8vIHRoZSBkZWZhdWx0IHRoYXQgdGhlIHVzZXIgd291bGQgZ2V0IHdpdGhvdXQgY2hhbmdpbmcg YW55IHByZWZzLgogICAgIFNpbXBsZUZvbnREYXRhKiBmYWxsYmFjayA9IDA7Ci0jaWYgT1MoV0lO RE9XUykgfHwgKE9TKERBUldJTikgJiYgIWRlZmluZWQoQlVJTERJTkdfT05fVElHRVIpKQorI2lm IE9TKFdJTkRPV1MpCiAgICAgc3RhdGljIEF0b21pY1N0cmluZyBmYWxsYmFja05hbWUoIkFyaWFs IFVuaWNvZGUgTVMiKTsKICNlbHNlCiAgICAgc3RhdGljIEF0b21pY1N0cmluZyBmYWxsYmFja05h bWUoIlRpbWVzIE5ldyBSb21hbiIpOwogI2VuZGlmCiAgICAgZmFsbGJhY2sgPSBnZXRDYWNoZWRG b250RGF0YShmb250RGVzY3JpcHRpb24sIGZhbGxiYWNrTmFtZSk7CisgICAgQVNTRVJUKGZhbGxi YWNrKTsKICAgICAKICAgICByZXR1cm4gZmFsbGJhY2s7CiB9CkluZGV4OiBXZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3d4L0ZvbnRQbGF0Zm9ybURhdGFXeC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy93eC9Gb250UGxhdGZvcm1EYXRhV3guY3BwCShyZXZpc2lv biA1OTc2NikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd3gvRm9udFBsYXRmb3JtRGF0 YVd4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA1LDYgKzEwNSw3IEBACiAjZWxzZQogICAgIG1f YXRzdUZvbnRJRCA9IG1fZm9udC0+Zm9udCgpLT5NYWNHZXRBVFNVRm9udElEKCk7CiAjZW5kaWYK KyAgICBtX25zRm9udCA9IDA7CiAgICAgY2FjaGVOU0ZvbnQoKTsKICNlbmRpZgogICAgIG1fc2l6 ZSA9IGRlc2MuY29tcHV0ZWRQaXhlbFNpemUoKTsK