38931 2010-05-11 12:57:11 -0700 wx port: NSFont not used on some WX versions 2010-05-11 17:58:24 -0700 1 1 1 Unclassified WebKit WebKit wx 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 0 kevinwatters webkit-unassigned abarth eric kevino webkit.review.bot oldest_to_newest 224111 0 55741 kevinwatters 2010-05-11 12:57:11 -0700 Created attachment 55741 create NSFonts on wx 2.8 wx versions older than 2.9 are not creating NSFonts for text rendering. 224243 1 kevino 2010-05-11 16:39:32 -0700 Landed in r59183, thanks! 224305 2 webkit.review.bot 2010-05-11 17:58:24 -0700 http://trac.webkit.org/changeset/59183 might have broken GTK Linux 32-bit Debug The following changes are on the blame list: http://trac.webkit.org/changeset/59182 http://trac.webkit.org/changeset/59183 55741 2010-05-11 12:57:11 -0700 2010-05-11 13:20:31 -0700 create NSFonts on wx 2.8 nsfont_wx28.patch text/plain 6718 kevinwatters SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1OTE1OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDUtMTEgIEtldmluIFdhdHRlcnMgIDxrZXZpbndhdHRlcnNA Z21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFt3eF0gQ3JlYXRlIGFuIE5TRm9udCBvbiBNYWMgYnVpbGRzIHRoYXQgZG8gbm90IGhhdmUg YnVpbHQtaW4gbWV0aG9kcyB0byBkbyBzby4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L3d4L0ZvbnRQbGF0Zm9ybURhdGEuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURh dGE6Om5zRm9udCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd3gvRm9udFBsYXRmb3Jt RGF0YVd4TWFjLm1tOgorICAgICAgICAoRGVnVG9SYWQpOgorICAgICAgICAoT1NYQ3JlYXRlTlNG b250KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6OmNhY2hlTlNGb250KToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93eC9TaW1wbGVGb250RGF0YVd4LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybVdpZHRoRm9yR2x5cGgpOgor CiAyMDEwLTA1LTExICBYYW4gTG9wZXogIDx4bG9wZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBHdXN0YXZvIE5vcm9uaGEuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3d4L0ZvbnRQbGF0Zm9ybURhdGEuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3d4L0ZvbnRQbGF0Zm9ybURhdGEuaAkocmV2aXNpb24gNTkxNTkpCisrKyBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3d4L0ZvbnRQbGF0Zm9ybURhdGEuaAkod29ya2luZyBjb3B5 KQpAQCAtMTU2LDkgKzE1Niw4IEBACiAjaWYgT1MoREFSV0lOKQogICAgIEFUU1VGb250SUQgbV9h dHN1Rm9udElEOwogICAgIENHRm9udFJlZiBjZ0ZvbnQoKSBjb25zdDsKLSAgICBOU0ZvbnQqIG5z Rm9udCgpIGNvbnN0OworICAgIE5TRm9udCogbnNGb250KCkgY29uc3QgeyByZXR1cm4gbV9uc0Zv bnQ7IH0KICAgICB2b2lkIGNhY2hlTlNGb250KCk7Ci0gICAgCiAjZW5kaWYKIAogICAgIGZsb2F0 IG1fc2l6ZTsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd3gvU2ltcGxlRm9udERh dGFXeC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93eC9TaW1w bGVGb250RGF0YVd4LmNwcAkocmV2aXNpb24gNTkxNTkpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3d4L1NpbXBsZUZvbnREYXRhV3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzMsNyAr MTMzLDcgQEAKICNpZiBfX1dYTVNXX18KICAgICAvLyB1bmRlciBXaW5kb3dzIC8gd3hNU1cgd2Ug Y3VycmVudGx5IGFsd2F5cyB1c2UgR0RJIGZvbnRzLgogICAgIHJldHVybiB3aWR0aEZvckdESUds eXBoKGdseXBoKTsKLSNlbGlmIE9TKERBUldJTikgJiYgd3hDSEVDS19WRVJTSU9OKDIsOSwxKSAm JiB3eE9TWF9VU0VfQ09DT0EKKyNlbGlmIE9TKERBUldJTikKICAgICBmbG9hdCBwb2ludFNpemUg PSBtX3BsYXRmb3JtRGF0YS5zaXplKCk7CiAgICAgQ0dBZmZpbmVUcmFuc2Zvcm0gbSA9IENHQWZm aW5lVHJhbnNmb3JtTWFrZVNjYWxlKHBvaW50U2l6ZSwgcG9pbnRTaXplKTsKICAgICBDR1NpemUg YWR2YW5jZTsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd3gvRm9udFBsYXRmb3Jt RGF0YVd4TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd3gv Rm9udFBsYXRmb3JtRGF0YVd4TWFjLm1tCShyZXZpc2lvbiA1OTE1OSkKKysrIFdlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd3gvRm9udFBsYXRmb3JtRGF0YVd4TWFjLm1tCSh3b3JraW5nIGNvcHkp CkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxMCBLZXZpbiBPbGxpdmll ciAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMCBLZXZpbiBPbGxp dmllciwgU3RlZmFuIENzb21vciAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3Ry aWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhv dXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xs b3dpbmcgY29uZGl0aW9ucwpAQCAtMzEsMjIgKzMxLDExNyBAQAogCiAjaW5jbHVkZSA8d3gvZGVm cy5oPgogI2luY2x1ZGUgPHd4L2ZvbnQuaD4KKyNpbmNsdWRlIDx3eC9mb250dXRpbC5oPgogCisj aWYgIXd4Q0hFQ0tfVkVSU0lPTigyLDksMCkKKyNpbmNsdWRlIDx3eC9tYWMvcHJpdmF0ZS5oPgor I2Vsc2UKKyNpbmNsdWRlIDx3eC9vc3gvcHJpdmF0ZS5oPgorI2VuZGlmCisKKyNpZiAhd3hDSEVD S19WRVJTSU9OKDIsOSwwKSB8fCAhd3hPU1hfVVNFX0NPQ09BCisKK3N0YXRpYyBpbmxpbmUgZG91 YmxlIERlZ1RvUmFkKGRvdWJsZSBkZWcpCit7CisgICAgcmV0dXJuIChkZWcgKiBNX1BJKSAvIDE4 MC4wOworfQorCitzdGF0aWMgY29uc3QgTlNBZmZpbmVUcmFuc2Zvcm1TdHJ1Y3Qga1NsYW50TlNU cmFuc2Zvcm1TdHJ1Y3QgPSB7IDEsIDAsIHRhbihEZWdUb1JhZCgxMSkpLCAxLCAwLCAwICB9Owor CitOU0ZvbnQqIE9TWENyZWF0ZU5TRm9udChjb25zdCB3eE5hdGl2ZUZvbnRJbmZvKiBpbmZvKQor eworICAgIE5TRm9udCogbnNGb250OworICAgIGludCB3ZWlnaHQgPSA1OworICAgIE5TRm9udFRy YWl0TWFzayB0cmFpdHMgPSAwOworICAgIGlmIChpbmZvLT5HZXRXZWlnaHQoKSA9PSB3eEZPTlRX RUlHSFRfQk9MRCkKKyAgICB7CisgICAgICAgIHRyYWl0cyB8PSBOU0JvbGRGb250TWFzazsKKyAg ICAgICAgd2VpZ2h0ID0gOTsKKyAgICB9CisgICAgZWxzZSBpZiAoaW5mby0+R2V0V2VpZ2h0KCkg PT0gd3hGT05UV0VJR0hUX0xJR0hUKQorICAgICAgICB3ZWlnaHQgPSAzOworCisgICAgaWYgKGlu Zm8tPkdldFN0eWxlKCkgPT0gd3hGT05UU1RZTEVfSVRBTElDIHx8IGluZm8tPkdldFN0eWxlKCkg PT0gd3hGT05UU1RZTEVfU0xBTlQpCisgICAgICAgIHRyYWl0cyB8PSBOU0l0YWxpY0ZvbnRNYXNr OworICAgIAorICAgIG5zRm9udCA9IFtbTlNGb250TWFuYWdlciBzaGFyZWRGb250TWFuYWdlcl0g Zm9udFdpdGhGYW1pbHk6KE5TU3RyaW5nKikoQ0ZTdHJpbmdSZWYpd3hNYWNDRlN0cmluZ0hvbGRl cihpbmZvLT5HZXRGYWNlTmFtZSgpKSAKKyAgICAgICAgdHJhaXRzOnRyYWl0cyB3ZWlnaHQ6d2Vp Z2h0IHNpemU6aW5mby0+R2V0UG9pbnRTaXplKCldOworICAgIAorICAgIGlmICggbnNGb250ID09 IG5pbCApCisgICAgeworICAgICAgICBOU0ZvbnRUcmFpdE1hc2sgcmVtYWluaW5nVHJhaXRzID0g dHJhaXRzOworICAgICAgICBuc0ZvbnQgPSBbW05TRm9udE1hbmFnZXIgc2hhcmVkRm9udE1hbmFn ZXJdIGZvbnRXaXRoRmFtaWx5OihOU1N0cmluZyopKENGU3RyaW5nUmVmKXd4TWFjQ0ZTdHJpbmdI b2xkZXIoaW5mby0+R2V0RmFjZU5hbWUoKSkgCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0cmFpdHM6MCB3ZWlnaHQ6NSBzaXplOmlu Zm8tPkdldFBvaW50U2l6ZSgpXTsKKyAgICAgICAgaWYgKCBuc0ZvbnQgPT0gbmlsICkKKyAgICAg ICAgeworICAgICAgICAgICAgaWYgKCBpbmZvLT5HZXRXZWlnaHQoKSA9PSB3eEZPTlRXRUlHSFRf Qk9MRCApCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgbnNGb250ID0gW05TRm9udCBi b2xkU3lzdGVtRm9udE9mU2l6ZTppbmZvLT5HZXRQb2ludFNpemUoKV07CisgICAgICAgICAgICAg ICAgcmVtYWluaW5nVHJhaXRzICY9IH5OU0JvbGRGb250TWFzazsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBuc0ZvbnQgPSBbTlNGb250IHN5c3RlbUZv bnRPZlNpemU6aW5mby0+R2V0UG9pbnRTaXplKCldOworICAgICAgICB9CisgICAgICAgIAorICAg ICAgICAvLyBmYWxsYmFjayAtIGlmIGluIGRvdWJ0LCBsZXQgZ28gb2YgdGhlIGJvbGQgYXR0cmli dXRlCisgICAgICAgIGlmICggbnNGb250ICYmIChyZW1haW5pbmdUcmFpdHMgJiBOU0l0YWxpY0Zv bnRNYXNrKSApCisgICAgICAgIHsKKyAgICAgICAgICAgIE5TRm9udCogbnNGb250V2l0aFRyYWl0 cyA9IG5pbDsKKyAgICAgICAgICAgIGlmICggcmVtYWluaW5nVHJhaXRzICYgTlNCb2xkRm9udE1h c2spCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgbnNGb250V2l0aFRyYWl0cyA9IFtb TlNGb250TWFuYWdlciBzaGFyZWRGb250TWFuYWdlcl0gY29udmVydEZvbnQ6bnNGb250IHRvSGF2 ZVRyYWl0Ok5TQm9sZEZvbnRNYXNrXTsKKyAgICAgICAgICAgICAgICBpZiAoIG5zRm9udFdpdGhU cmFpdHMgPT0gbmlsICkKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIG5z Rm9udFdpdGhUcmFpdHMgPSBbW05TRm9udE1hbmFnZXIgc2hhcmVkRm9udE1hbmFnZXJdIGNvbnZl cnRGb250Om5zRm9udCB0b0hhdmVUcmFpdDpOU0l0YWxpY0ZvbnRNYXNrXTsKKyAgICAgICAgICAg ICAgICAgICAgaWYgKCBuc0ZvbnRXaXRoVHJhaXRzICE9IG5pbCApCisgICAgICAgICAgICAgICAg ICAgICAgICByZW1haW5pbmdUcmFpdHMgJj0gfk5TSXRhbGljRm9udE1hc2s7CisgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICB7CisgICAgICAg ICAgICAgICAgICAgIHJlbWFpbmluZ1RyYWl0cyAmPSB+TlNCb2xkRm9udE1hc2s7CisgICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKCByZW1haW5pbmdUcmFp dHMgJiBOU0l0YWxpY0ZvbnRNYXNrKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGlm ICggbnNGb250V2l0aFRyYWl0cyA9PSBuaWwgKQorICAgICAgICAgICAgICAgICAgICBuc0ZvbnRX aXRoVHJhaXRzID0gbnNGb250OworICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgIE5T QWZmaW5lVHJhbnNmb3JtKiB0cmFuc2Zvcm0gPSBbTlNBZmZpbmVUcmFuc2Zvcm0gdHJhbnNmb3Jt XTsKKyAgICAgICAgICAgICAgICBbdHJhbnNmb3JtIHNldFRyYW5zZm9ybVN0cnVjdDprU2xhbnRO U1RyYW5zZm9ybVN0cnVjdF07CisgICAgICAgICAgICAgICAgW3RyYW5zZm9ybSBzY2FsZUJ5Omlu Zm8tPkdldFBvaW50U2l6ZSgpXTsKKyAgICAgICAgICAgICAgICBOU0ZvbnREZXNjcmlwdG9yKiBp dGFsaWNEZXNjID0gW1tuc0ZvbnRXaXRoVHJhaXRzIGZvbnREZXNjcmlwdG9yXSBmb250RGVzY3Jp cHRvcldpdGhNYXRyaXg6dHJhbnNmb3JtXTsKKyAgICAgICAgICAgICAgICBpZiAoIGl0YWxpY0Rl c2MgIT0gbmlsICkKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgIE5TRm9u dCogZiA9IFtOU0ZvbnQgZm9udFdpdGhEZXNjcmlwdG9yOml0YWxpY0Rlc2Mgc2l6ZTooQ0dGbG9h dCkoaW5mby0+R2V0UG9pbnRTaXplKCkpXTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCBmICE9 IG5pbCApCisgICAgICAgICAgICAgICAgICAgICAgICBuc0ZvbnRXaXRoVHJhaXRzID0gZjsKKyAg ICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAoIG5zRm9udFdp dGhUcmFpdHMgIT0gbmlsICkKKyAgICAgICAgICAgICAgICBuc0ZvbnQgPSBuc0ZvbnRXaXRoVHJh aXRzOworICAgICAgICB9CisgICAgfQorICAgICAgICAgICAgCisgICAgd3hBU1NFUlRfTVNHKG5z Rm9udCAhPSBuaWwsd3hUKCJDb3VsZG4ndCBjcmVhdGUgbnNGb250IikpIDsKKyAgICB3eE1hY0Nv Y29hUmV0YWluKG5zRm9udCk7CisgICAgcmV0dXJuIG5zRm9udDsKK30KKworI2VuZGlmCisKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAotTlNGb250KiBGb250UGxhdGZvcm1EYXRhOjpuc0ZvbnQoKSBj b25zdAordm9pZCBGb250UGxhdGZvcm1EYXRhOjpjYWNoZU5TRm9udCgpCiB7CisgICAgaWYgKG1f bnNGb250KQorICAgICAgICByZXR1cm47CisgICAgICAgIAogI2lmIHd4Q0hFQ0tfVkVSU0lPTigy LDksMSkgJiYgd3hPU1hfVVNFX0NPQ09BCiAgICAgaWYgKG1fZm9udCAmJiBtX2ZvbnQtPmZvbnQo KSkKLSAgICAgICAgcmV0dXJuIChOU0ZvbnQqKW1fZm9udC0+Zm9udCgpLT5PU1hHZXROU0ZvbnQo KTsKKyAgICAgICAgbV9uc0ZvbnQgPSAoTlNGb250KiltX2ZvbnQtPmZvbnQoKS0+T1NYR2V0TlNG b250KCk7CiAjZWxzZQotICAgIHJldHVybiAwOworICAgIG1fbnNGb250ID0gT1NYQ3JlYXRlTlNG b250KG1fZm9udC0+Zm9udCgpLT5HZXROYXRpdmVGb250SW5mbygpKTsKICNlbmRpZgogfQogCi12 b2lkIEZvbnRQbGF0Zm9ybURhdGE6OmNhY2hlTlNGb250KCkKLXsKLQogfQotCi19Cg==