26161 2009-06-03 07:45:10 -0700 wx mac text rendering is inaccurate 2009-06-03 10:44:52 -0700 1 1 1 Unclassified WebKit WebKit wx 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 kevinwatters webkit-unassigned oldest_to_newest 124149 0 kevinwatters 2009-06-03 07:45:10 -0700 The wx port's mac text implementation does not match other browsers. 124150 1 30907 kevinwatters 2009-06-03 07:47:29 -0700 Created attachment 30907 Use CGFontGetGlyphsForUnichars to improve font sizing 124172 2 kevino 2009-06-03 10:44:52 -0700 Landed in r44387, thanks! 30907 2009-06-03 07:47:29 -0700 2009-06-03 09:17:13 -0700 Use CGFontGetGlyphsForUnichars to improve font sizing mac_text_fixes.patch text/plain 5102 kevinwatters SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDM3OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTIgQEAKKzIwMDktMDYtMDIgIEtldmluIFdhdHRlcnMgIDxrZXZpbndhdHRlcnNA Z21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFVzZSBDR0NvbnRleHRTaG93R2x5cGhzV2l0aEFkdmFuY2VzIHRvIGdldCBtb3JlIGFjY3Vy YXRlIHRleHQgcmVuZGVyaW5nIG9uIE1hYy4KKworICAgICAgICAqIHBsYXRmb3JtL3d4L3d4Y29k ZS9tYWMvY2FyYm9uL25vbi1rZXJuZWQtZHJhd2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpk cmF3VGV4dFdpdGhTcGFjaW5nKToKKwogMjAwOS0wNi0wMiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBh cHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgSHlhdHQuCkluZGV4OiBXZWJD b3JlL3BsYXRmb3JtL3d4L3d4Y29kZS9tYWMvY2FyYm9uL25vbi1rZXJuZWQtZHJhd2luZy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS93eC93eGNvZGUvbWFjL2NhcmJvbi9ub24t a2VybmVkLWRyYXdpbmcuY3BwCShyZXZpc2lvbiA0NDM3OSkKKysrIFdlYkNvcmUvcGxhdGZvcm0v d3gvd3hjb2RlL21hYy9jYXJib24vbm9uLWtlcm5lZC1kcmF3aW5nLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjQsNDQgKzI0LDk3IEBACiAgKi8KIAogI2luY2x1ZGUgImNvbmZpZy5oIgorI2luY2x1 ZGUgIkZsb2F0U2l6ZS5oIgogI2luY2x1ZGUgIkdseXBoQnVmZmVyLmgiCiAjaW5jbHVkZSAiR3Jh cGhpY3NDb250ZXh0LmgiCiAjaW5jbHVkZSAiU2ltcGxlRm9udERhdGEuaCIKKyNpbmNsdWRlIDx3 dGYvVmVjdG9yLmg+CiAKKyNpbmNsdWRlIDxBcHBsaWNhdGlvblNlcnZpY2VzL0FwcGxpY2F0aW9u U2VydmljZXMuaD4KKworI2luY2x1ZGUgPGRsZmNuLmg+CisKICNpbmNsdWRlIDx3eC9kZWZzLmg+ CiAjaW5jbHVkZSA8d3gvZGNjbGllbnQuaD4KICNpbmNsdWRlIDx3eC9kY2dyYXBoLmg+CiAjaW5j bHVkZSA8d3gvZ2RpY21uLmg+Ci0jaW5jbHVkZSA8dmVjdG9yPgogCisKKy8vIFVuZm9ydHVuYXRl bHkgd2UgbmVlZCBhY2Nlc3MgdG8gYSBwcml2YXRlIGZ1bmN0aW9uIHRvIGdldCB0aGUgY2hhcmFj dGVyIC0+IGdseXBoIGNvbnZlcnNpb24gbmVlZGVkIHRvCisvLyBhbGxvdyB1cyB0byB1c2UgQ0dD b250ZXh0U2hvd0dseXBoc1dpdGhBZHZhbmNlcworLy8gTm90ZSB0aGF0IG9uIDwgMTAuNSwgdGhl IGZ1bmN0aW9uIGlzIGNhbGxlZCBDR0ZvbnRHZXRHbHlwaHNGb3JVbmljb2Rlcywgc28gd2UgbmVl ZCB0byBkZXRlY3QgYW5kIGRlYWwKKy8vIHdpdGggdGhpcy4KK3R5cGVkZWYgdm9pZCAoKkNHRm9u dEdldEdseXBoc0ZvclVuaWNoYXJzUHRyKShDR0ZvbnRSZWYsIGNvbnN0IFVuaUNoYXJbXSwgY29u c3QgQ0dHbHlwaFtdLCBzaXplX3QpOworc3RhdGljIENHRm9udEdldEdseXBoc0ZvclVuaWNoYXJz UHRyIENHRm9udEdldEdseXBoc0ZvclVuaWNoYXJzID0gKENHRm9udEdldEdseXBoc0ZvclVuaWNo YXJzUHRyKWRsc3ltKFJUTERfREVGQVVMVCwgIkNHRm9udEdldEdseXBoc0ZvclVuaWNoYXJzIik7 CisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdm9pZCBkcmF3VGV4dFdpdGhTcGFjaW5nKEdyYXBo aWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0LCBjb25zdCBTaW1wbGVGb250RGF0YSogZm9udCwg Y29uc3Qgd3hDb2xvdXImIGNvbG9yLCBjb25zdCBHbHlwaEJ1ZmZlciYgZ2x5cGhCdWZmZXIsIGlu dCBmcm9tLCBpbnQgbnVtR2x5cGhzLCBjb25zdCBGbG9hdFBvaW50JiBwb2ludCkKIHsKLSNpZiBV U0UoV1hHQykKKyAgICBncmFwaGljc0NvbnRleHQtPnNhdmUoKTsKKyAgICAKICAgICB3eEdDREMq IGRjID0gc3RhdGljX2Nhc3Q8d3hHQ0RDKj4oZ3JhcGhpY3NDb250ZXh0LT5wbGF0Zm9ybUNvbnRl eHQoKSk7CisKKyAgICB3eEZvbnQqIHd4Zm9udCA9IGZvbnQtPmdldFd4Rm9udCgpOworICAgIC8v aWYgKHd4Zm9udC0+SXNPaygpKQorICAgIC8vICAgIGRjLT5TZXRGb250KCp3eGZvbnQpOworICAg IGdyYXBoaWNzQ29udGV4dC0+c2V0RmlsbENvbG9yKGdyYXBoaWNzQ29udGV4dC0+ZmlsbENvbG9y KCkpOworCisgICAgQ0dDb250ZXh0UmVmIGNnQ29udGV4dCA9IHN0YXRpY19jYXN0PENHQ29udGV4 dFJlZj4oZGMtPkdldEdyYXBoaWNzQ29udGV4dCgpLT5HZXROYXRpdmVDb250ZXh0KCkpOworCisg ICAgQ0dGb250UmVmIGNnRm9udDsKKworI2lmZGVmIHd4T1NYX1VTRV9DT1JFX1RFWFQgJiYgd3hP U1hfVVNFX0NPUkVfVEVYVAorICAgIGNnRm9udCA9IENURm9udENvcHlHcmFwaGljc0ZvbnQoKENU Rm9udFJlZilmb250LT5PU1hHZXRDVEZvbnQoKSwgTlVMTCk7CiAjZWxzZQotICAgIHd4REMqIGRj ID0gZ3JhcGhpY3NDb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKTsKKyAgICBBVFNGb250UmVmIGZv bnRSZWY7CisgICAgCisgICAgZm9udFJlZiA9IEZNR2V0QVRTRm9udFJlZkZyb21Gb250KHd4Zm9u dC0+TWFjR2V0QVRTVUZvbnRJRCgpKTsKKyAgICAKKyAgICBpZiAoZm9udFJlZikKKyAgICAgICAg Y2dGb250ID0gQ0dGb250Q3JlYXRlV2l0aFBsYXRmb3JtRm9udCgodm9pZCopJmZvbnRSZWYpOwog I2VuZGlmCisgICAgCisgICAgQ0dDb250ZXh0U2V0Rm9udChjZ0NvbnRleHQsIGNnRm9udCk7CiAK LSAgICB3eEZvbnQqIHd4Zm9udCA9IGZvbnQtPmdldFd4Rm9udCgpOwotICAgIGlmICh3eGZvbnQt PklzT2soKSkKLSAgICAgICAgZGMtPlNldEZvbnQoKnd4Zm9udCk7Ci0gICAgZGMtPlNldFRleHRG b3JlZ3JvdW5kKGNvbG9yKTsKKyAgICBDR0NvbnRleHRTZXRGb250U2l6ZShjZ0NvbnRleHQsIHd4 Zm9udC0+R2V0UG9pbnRTaXplKCkpOwogCi0gICAgLy8gY29udmVydCBnbHlwaHMgdG8gd3hTdHJp bmcKLSAgICBHbHlwaEJ1ZmZlckdseXBoKiBnbHlwaHMgPSBjb25zdF9jYXN0PEdseXBoQnVmZmVy R2x5cGgqPihnbHlwaEJ1ZmZlci5nbHlwaHMoZnJvbSkpOwotICAgIGludCBvZmZzZXQgPSBwb2lu dC54KCk7Ci0gICAgd3hTdHJpbmcgdGV4dCA9IHd4RW1wdHlTdHJpbmc7Ci0gICAgZm9yICh1bnNp Z25lZCBpID0gMDsgaSA8IG51bUdseXBoczsgaSsrKSB7Ci0gICAgICAgIHRleHQgPSB0ZXh0LkFw cGVuZCgod3hDaGFyKWdseXBoc1tpXSk7Ci0gICAgICAgIG9mZnNldCArPSBnbHlwaEJ1ZmZlci5h ZHZhbmNlQXQoZnJvbSArIGkpOworICAgIENHRmxvYXQgcmVkLCBncmVlbiwgYmx1ZSwgYWxwaGE7 CisgICAgZ3JhcGhpY3NDb250ZXh0LT5maWxsQ29sb3IoKS5nZXRSR0JBKHJlZCwgZ3JlZW4sIGJs dWUsIGFscGhhKTsKKyAgICBDR0NvbnRleHRTZXRSR0JGaWxsQ29sb3IoY2dDb250ZXh0LCByZWQs IGdyZWVuLCBibHVlLCBhbHBoYSk7CisKKyAgICBDR0FmZmluZVRyYW5zZm9ybSBtYXRyaXggPSBD R0FmZmluZVRyYW5zZm9ybUlkZW50aXR5OworICAgIG1hdHJpeC5iID0gLW1hdHJpeC5iOworICAg IG1hdHJpeC5kID0gLW1hdHJpeC5kOworICAgIAorICAgIENHQ29udGV4dFNldFRleHRNYXRyaXgo Y2dDb250ZXh0LCBtYXRyaXgpOworCisgICAgQ0dDb250ZXh0U2V0VGV4dFBvc2l0aW9uKGNnQ29u dGV4dCwgcG9pbnQueCgpLCBwb2ludC55KCkpOworICAgIAorICAgIGNvbnN0IEZsb2F0U2l6ZSog YWR2YW5jZVNpemVzID0gc3RhdGljX2Nhc3Q8Y29uc3QgRmxvYXRTaXplKj4oZ2x5cGhCdWZmZXIu YWR2YW5jZXMoZnJvbSkpOworICAgIGludCBzaXplID0gZ2x5cGhCdWZmZXIuc2l6ZSgpIC0gZnJv bTsKKyAgICBDR1NpemUgc2l6ZXNbc2l6ZV07CisgICAgQ0dHbHlwaCBnbHlwaHNbbnVtR2x5cGhz XTsKKyAgICAKKyAgICAvLyBpZiB0aGUgZnVuY3Rpb24gZG9lc24ndCBleGlzdCwgd2UncmUgcHJv YmFibHkgb24gdGlnZXIgYW5kIG5lZWQgdG8gZ3JhYiB0aGUKKyAgICAvLyBmdW5jdGlvbiB1bmRl ciBpdHMgb2xkIG5hbWUsIENHRm9udEdldEdseXBoc0ZvclVuaWNvZGVzCisgICAgaWYgKCFDR0Zv bnRHZXRHbHlwaHNGb3JVbmljaGFycykKKyAgICAgICAgQ0dGb250R2V0R2x5cGhzRm9yVW5pY2hh cnMgPSAoQ0dGb250R2V0R2x5cGhzRm9yVW5pY2hhcnNQdHIpZGxzeW0oUlRMRF9ERUZBVUxULCAi Q0dGb250R2V0R2x5cGhzRm9yVW5pY29kZXMiKTsKKyAgICAKKyAgICAvLyBMZXQncyBtYWtlIHN1 cmUgd2UgZ290IHRoZSBmdW5jdGlvbiB1bmRlciBvbmUgbmFtZSBvciBhbm90aGVyIQorICAgIEFT U0VSVChDR0ZvbnRHZXRHbHlwaHNGb3JVbmljaGFycyk7CisgICAgQ0dGb250R2V0R2x5cGhzRm9y VW5pY2hhcnMoY2dGb250LCBnbHlwaEJ1ZmZlci5nbHlwaHMoZnJvbSksIGdseXBocywgbnVtR2x5 cGhzKTsKKyAgICAKKyAgICBmb3IgKGludCBpID0gMDsgaSA8IHNpemU7IGkrKykgeworICAgICAg ICBGbG9hdFNpemUgZnNpemUgPSBhZHZhbmNlU2l6ZXNbaV07CisgICAgICAgIHNpemVzW2ldID0g Q0dTaXplTWFrZShmc2l6ZS53aWR0aCgpLCBmc2l6ZS5oZWlnaHQoKSk7CiAgICAgfQogICAgIAot ICAgIC8vIE5PVEU6IFRoZSB3eCBBUEkgYWN0dWFsbHkgYWRkcyB0aGUgYXNjZW50IHRvIHRoZSB5 IHZhbHVlIGludGVybmFsbHksCi0gICAgLy8gc28gd2UgaGF2ZSB0byBzdWJ0cmFjdCBpdCBmcm9t IHRoZSB5IHBvaW50IGhlcmUgc28gdGhhdCB0aGUgYXNjZW50Ci0gICAgLy8gaXNuJ3QgYWRkZWQg dHdpY2UuIAotICAgIGRjLT5EcmF3VGV4dCh0ZXh0LCAod3hDb29yZClwb2ludC54KCksIGludChw b2ludC55KCkgLSBmb250LT5hc2NlbnQoKSkpOworICAgIENHQ29udGV4dFNob3dHbHlwaHNXaXRo QWR2YW5jZXMoY2dDb250ZXh0LCBnbHlwaHMsIHNpemVzLCBudW1HbHlwaHMpOworICAgIAorICAg IGlmIChjZ0ZvbnQpCisgICAgICAgIENHRm9udFJlbGVhc2UoY2dGb250KTsKKyAgICBncmFwaGlj c0NvbnRleHQtPnJlc3RvcmUoKTsKIH0KIAogfQo=