28453 2009-08-19 06:18:31 -0700 [CAIRO] Remove setFont indirection 2009-08-19 13:31:26 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC All RESOLVED FIXED Cairo, Gtk P2 Normal --- 1 jmalonzo webkit-unassigned bfulgham oldest_to_newest 141463 0 jmalonzo 2009-08-19 06:18:31 -0700 The Cairo ports (Gtk & Cairo/Win) use setFont to set a scaled font for cairo_t. I think the indirections are unnecessary as there's only one call site, which is in Font::drawGlyphs. Patch forthcoming. 141464 1 jmalonzo 2009-08-19 06:21:09 -0700 CC'ing Brent so he can look at it too. 141465 2 35117 jmalonzo 2009-08-19 06:23:32 -0700 Created attachment 35117 Patch v1 141490 3 bfulgham 2009-08-19 09:17:21 -0700 Looks good to me. I don't see how this could cause me any problems. 141524 4 35117 eric 2009-08-19 10:43:00 -0700 Comment on attachment 35117 Patch v1 OK. 141533 5 35117 eric 2009-08-19 10:57:13 -0700 Comment on attachment 35117 Patch v1 Rejecting patch 35117 from commit-queue. This patch will require manual commit. Failed to run "['git', 'svn', 'rebase']" exit_code: 1 cwd: None 141539 6 35117 eric 2009-08-19 11:38:37 -0700 Comment on attachment 35117 Patch v1 commit-queue bug. 141575 7 jmalonzo 2009-08-19 13:31:26 -0700 (In reply to comment #6) > (From update of attachment 35117 [details]) > commit-queue bug. Ok, Thanks. Landed as http://trac.webkit.org/changeset/47525. 35117 2009-08-19 06:23:32 -0700 2009-08-19 11:38:37 -0700 Patch v1 bug-28453-20090819232330.patch text/plain 7092 jmalonzo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YTJhNWRlYy4uNDJiNmU1NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyOCBAQAogMjAwOS0wOC0xOSAgSmFuIE1pY2hhZWwg QWxvbnpvICA8am1hbG9uem9Ad2Via2l0Lm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBbQ0FJUk9dIFJlbW92ZSBzZXRGb250IGluZGlyZWN0aW9u CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODQ1Mwor CisgICAgICAgIFJlbW92ZSB0aGUgaW5kaXJlY3Rpb24gYW5kIGp1c3Qgc2V0IHRoZSBmb250IGlu IEZvbnQ6OmRyYXdHbHlwaHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9TaW1wbGVG b250RGF0YS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRDYWlyby5j cHA6CisgICAgICAgIChXZWJDb3JlOjpGb250OjpkcmF3R2x5cGhzKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9ndGsvRm9udFBsYXRmb3JtRGF0YS5oOgorICAgICAgICAoV2ViQ29yZTo6 Rm9udFBsYXRmb3JtRGF0YTo6c2NhbGVkRm9udCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvZ3RrL0ZvbnRQbGF0Zm9ybURhdGFHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udFBs YXRmb3JtRGF0YTo6fkZvbnRQbGF0Zm9ybURhdGEpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2d0ay9Gb250UGxhdGZvcm1EYXRhUGFuZ28uY3BwOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2d0ay9TaW1wbGVGb250RGF0YUd0ay5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvZ3RrL1NpbXBsZUZvbnREYXRhUGFuZ28uY3BwOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL3dpbi9Gb250UGxhdGZvcm1EYXRhLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3Mvd2luL0ZvbnRQbGF0Zm9ybURhdGFDYWlyb1dpbi5jcHA6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhQ2Fpcm9XaW4uY3BwOgorCisyMDA5LTA4LTE5ICBK YW4gTWljaGFlbCBBbG9uem8gIDxqbWFsb256b0B3ZWJraXQub3JnPgorCiAgICAgICAgIFJldmll d2VkIGJ5IFhhbiBMb3Blei4KIAogICAgICAgICBbR3RrXSBSZW1vdmUgYm9ndXMgZGVwZW5kZW5j eSBydWxlcyBmb3IgYnVpbHQgc291cmNlcyB0aGF0IGRlcml2ZQpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9TaW1wbGVGb250RGF0YS5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9TaW1wbGVGb250RGF0YS5oCmluZGV4IDhjYjgyNjguLjVhNDA1OWQgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2ltcGxlRm9udERhdGEuaAorKysgYi9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL1NpbXBsZUZvbnREYXRhLmgKQEAgLTE0NSwxMCArMTQ1LDYg QEAgcHVibGljOgogICAgIHN0YXRpYyBib29sIHNob3VsZEFwcGx5TWFjQXNjZW50SGFjaygpOwog I2VuZGlmCiAKLSNpZiBQTEFURk9STShDQUlSTykKLSAgICB2b2lkIHNldEZvbnQoY2Fpcm9fdCop IGNvbnN0OwotI2VuZGlmCi0KICNpZiBQTEFURk9STShXWCkKICAgICB3eEZvbnQqIGdldFd4Rm9u dCgpIGNvbnN0IHsgcmV0dXJuIG1fcGxhdGZvcm1EYXRhLmZvbnQoKTsgfQogI2VuZGlmCmRpZmYg LS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRDYWlyby5jcHAgYi9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRDYWlyby5jcHAKaW5kZXggMGY3YWU3 OS4uMWE5NTFjMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9G b250Q2Fpcm8uY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENh aXJvLmNwcApAQCAtNDYsNyArNDYsNyBAQCB2b2lkIEZvbnQ6OmRyYXdHbHlwaHMoR3JhcGhpY3ND b250ZXh0KiBjb250ZXh0LCBjb25zdCBTaW1wbGVGb250RGF0YSogZm9udCwgY29ucwogICAgIGNh aXJvX3QqIGNyID0gY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCk7CiAgICAgY2Fpcm9fc2F2ZShj cik7CiAKLSAgICBmb250LT5zZXRGb250KGNyKTsKKyAgICBjYWlyb19zZXRfc2NhbGVkX2ZvbnQo Y3IsIGZvbnQtPnBsYXRmb3JtRGF0YSgpLnNjYWxlZEZvbnQoKSk7CiAKICAgICBHbHlwaEJ1ZmZl ckdseXBoKiBnbHlwaHMgPSAoR2x5cGhCdWZmZXJHbHlwaCopZ2x5cGhCdWZmZXIuZ2x5cGhzKGZy b20pOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9Gb250UGxh dGZvcm1EYXRhLmggYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9Gb250UGxhdGZvcm1E YXRhLmgKaW5kZXggMmE2NWYxZS4uZDMwYjQ4MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9ndGsvRm9udFBsYXRmb3JtRGF0YS5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3RrL0ZvbnRQbGF0Zm9ybURhdGEuaApAQCAtODcsNyArODcsNyBAQCBwdWJsaWM6 CiAgICAgYm9vbCBzeW50aGV0aWNCb2xkKCkgY29uc3QgeyByZXR1cm4gbV9zeW50aGV0aWNCb2xk OyB9CiAgICAgYm9vbCBzeW50aGV0aWNPYmxpcXVlKCkgY29uc3QgeyByZXR1cm4gbV9zeW50aGV0 aWNPYmxpcXVlOyB9CiAKLSAgICB2b2lkIHNldEZvbnQoY2Fpcm9fdCopIGNvbnN0OworICAgIGNh aXJvX3NjYWxlZF9mb250X3QqIHNjYWxlZEZvbnQoKSBjb25zdCB7IHJldHVybiBtX3NjYWxlZEZv bnQ7IH0KIAogICAgIHVuc2lnbmVkIGhhc2goKSBjb25zdAogICAgIHsKZGlmZiAtLWdpdCBhL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ZvbnRQbGF0Zm9ybURhdGFHdGsuY3BwIGIvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvRm9udFBsYXRmb3JtRGF0YUd0ay5jcHAKaW5kZXgg ZjJjNWYwYy4uMGIxMjgwZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n dGsvRm9udFBsYXRmb3JtRGF0YUd0ay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ndGsvRm9udFBsYXRmb3JtRGF0YUd0ay5jcHAKQEAgLTIyNCwxMCArMjI0LDggQEAgRm9udFBs YXRmb3JtRGF0YTo6fkZvbnRQbGF0Zm9ybURhdGEoKQogICAgICAgICBtX2ZhbGxiYWNrcyA9IDA7 CiAgICAgfQogCi0gICAgaWYgKG1fc2NhbGVkRm9udCkgeworICAgIGlmIChtX3NjYWxlZEZvbnQp CiAgICAgICAgIGNhaXJvX3NjYWxlZF9mb250X2Rlc3Ryb3kobV9zY2FsZWRGb250KTsKLSAgICAg ICAgbV9zY2FsZWRGb250ID0gMDsKLSAgICB9CiB9CiAKIGJvb2wgRm9udFBsYXRmb3JtRGF0YTo6 aXNGaXhlZFBpdGNoKCkKQEAgLTI0MiwxMyArMjQwLDYgQEAgYm9vbCBGb250UGxhdGZvcm1EYXRh Ojppc0ZpeGVkUGl0Y2goKQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotdm9pZCBGb250UGxhdGZv cm1EYXRhOjpzZXRGb250KGNhaXJvX3QqIGNyKSBjb25zdAotewotICAgIEFTU0VSVChtX3NjYWxl ZEZvbnQpOwotCi0gICAgY2Fpcm9fc2V0X3NjYWxlZF9mb250KGNyLCBtX3NjYWxlZEZvbnQpOwot fQotCiBib29sIEZvbnRQbGF0Zm9ybURhdGE6Om9wZXJhdG9yPT0oY29uc3QgRm9udFBsYXRmb3Jt RGF0YSYgb3RoZXIpIGNvbnN0CiB7CiAgICAgaWYgKG1fcGF0dGVybiA9PSBvdGhlci5tX3BhdHRl cm4pCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9Gb250UGxhdGZv cm1EYXRhUGFuZ28uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvRm9udFBsYXRm b3JtRGF0YVBhbmdvLmNwcAppbmRleCA5ZWE2ODExLi44YTFhNWYxIDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9Gb250UGxhdGZvcm1EYXRhUGFuZ28uY3BwCisrKyBi L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ZvbnRQbGF0Zm9ybURhdGFQYW5nby5jcHAK QEAgLTIxNCwxMyArMjE0LDYgQEAgYm9vbCBGb250UGxhdGZvcm1EYXRhOjppc0ZpeGVkUGl0Y2go KQogICAgIHJldHVybiBwYW5nb19mb250X2ZhbWlseV9pc19tb25vc3BhY2UoZmFtaWx5KTsKIH0K IAotdm9pZCBGb250UGxhdGZvcm1EYXRhOjpzZXRGb250KGNhaXJvX3QqIGNyKSBjb25zdAotewot ICAgIEFTU0VSVChtX3NjYWxlZEZvbnQpOwotCi0gICAgY2Fpcm9fc2V0X3NjYWxlZF9mb250KGNy LCBtX3NjYWxlZEZvbnQpOwotfQotCiBGb250UGxhdGZvcm1EYXRhJiBGb250UGxhdGZvcm1EYXRh OjpvcGVyYXRvcj0oY29uc3QgRm9udFBsYXRmb3JtRGF0YSYgb3RoZXIpCiB7CiAgICAgLy8gQ2hl Y2sgZm9yIHNlbGYtYXNzaWdubWVudC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3RrL1NpbXBsZUZvbnREYXRhR3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3RrL1NpbXBsZUZvbnREYXRhR3RrLmNwcAppbmRleCBhNzdjMWNmLi5kYzA0NTVhIDEwMDY0 NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9TaW1wbGVGb250RGF0YUd0ay5j cHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvU2ltcGxlRm9udERhdGFHdGsu Y3BwCkBAIC0xMzAsMTAgKzEzMCw0IEBAIGZsb2F0IFNpbXBsZUZvbnREYXRhOjpwbGF0Zm9ybVdp ZHRoRm9yR2x5cGgoR2x5cGggZ2x5cGgpIGNvbnN0CiAgICAgcmV0dXJuIHc7CiB9CiAKLXZvaWQg U2ltcGxlRm9udERhdGE6OnNldEZvbnQoY2Fpcm9fdCogY3IpIGNvbnN0Ci17Ci0gICAgQVNTRVJU KGNyKTsKLSAgICBtX3BsYXRmb3JtRGF0YS5zZXRGb250KGNyKTsKLX0KLQogfQpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvU2ltcGxlRm9udERhdGFQYW5nby5jcHAg Yi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9TaW1wbGVGb250RGF0YVBhbmdvLmNwcApp bmRleCBlNTdkOWU2Li5lZjBiYjNkIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2d0ay9TaW1wbGVGb250RGF0YVBhbmdvLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2d0ay9TaW1wbGVGb250RGF0YVBhbmdvLmNwcApAQCAtMTMzLDEwICsxMzMsNCBAQCBm bG9hdCBTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1XaWR0aEZvckdseXBoKEdseXBoIGdseXBoKSBj b25zdAogICAgIHJldHVybiB3OwogfQogCi12b2lkIFNpbXBsZUZvbnREYXRhOjpzZXRGb250KGNh aXJvX3QqIGNyKSBjb25zdAotewotICAgIEFTU0VSVChjcik7Ci0gICAgbV9wbGF0Zm9ybURhdGEu c2V0Rm9udChjcik7Ci19Ci0KIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvd2luL0ZvbnRQbGF0Zm9ybURhdGEuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2lu L0ZvbnRQbGF0Zm9ybURhdGEuaAppbmRleCAwNjYwZDkwLi41MDg0NDY5IDEwMDY0NAotLS0gYS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250UGxhdGZvcm1EYXRhLmgKKysrIGIvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udFBsYXRmb3JtRGF0YS5oCkBAIC03OCw3ICs3 OCw2IEBAIHB1YmxpYzoKICNpZiBQTEFURk9STShDRykKICAgICBDR0ZvbnRSZWYgY2dGb250KCkg Y29uc3QgeyByZXR1cm4gbV9jZ0ZvbnQuZ2V0KCk7IH0KICNlbGlmIFBMQVRGT1JNKENBSVJPKQot ICAgIHZvaWQgc2V0Rm9udChjYWlyb190KiBmdCkgY29uc3Q7CiAgICAgY2Fpcm9fZm9udF9mYWNl X3QqIGZvbnRGYWNlKCkgY29uc3QgeyByZXR1cm4gbV9mb250RmFjZTsgfQogICAgIGNhaXJvX3Nj YWxlZF9mb250X3QqIHNjYWxlZEZvbnQoKSBjb25zdCB7IHJldHVybiBtX3NjYWxlZEZvbnQ7IH0K ICNlbmRpZgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udFBs YXRmb3JtRGF0YUNhaXJvV2luLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0Zv bnRQbGF0Zm9ybURhdGFDYWlyb1dpbi5jcHAKaW5kZXggYjU2YTcxYy4uOWZjZTY4YSAxMDA2NDQK LS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vRm9udFBsYXRmb3JtRGF0YUNhaXJv V2luLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250UGxhdGZvcm1E YXRhQ2Fpcm9XaW4uY3BwCkBAIC05NiwxMiArOTYsNiBAQCBGb250UGxhdGZvcm1EYXRhOjpGb250 UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnRQbGF0Zm9ybURhdGEmIHNvdXJjZSkKICAgICAgICAgbV9z Y2FsZWRGb250ID0gY2Fpcm9fc2NhbGVkX2ZvbnRfcmVmZXJlbmNlKHNvdXJjZS5tX3NjYWxlZEZv bnQpOwogfQogCi12b2lkIEZvbnRQbGF0Zm9ybURhdGE6OnNldEZvbnQoY2Fpcm9fdCogY3IpIGNv bnN0Ci17Ci0gICAgQVNTRVJUKG1fc2NhbGVkRm9udCk7Ci0KLSAgICBjYWlyb19zZXRfc2NhbGVk X2ZvbnQoY3IsIG1fc2NhbGVkRm9udCk7Ci19CiAKIEZvbnRQbGF0Zm9ybURhdGE6On5Gb250UGxh dGZvcm1EYXRhKCkKIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2lu L1NpbXBsZUZvbnREYXRhQ2Fpcm9XaW4uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93 aW4vU2ltcGxlRm9udERhdGFDYWlyb1dpbi5jcHAKaW5kZXggMDM0MzAwNy4uMjZiMjJhZiAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vU2ltcGxlRm9udERhdGFDYWly b1dpbi5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vU2ltcGxlRm9udERh dGFDYWlyb1dpbi5jcHAKQEAgLTExOSwxMCArMTE5LDQgQEAgZmxvYXQgU2ltcGxlRm9udERhdGE6 OnBsYXRmb3JtV2lkdGhGb3JHbHlwaChHbHlwaCBnbHlwaCkgY29uc3QKICAgICByZXR1cm4gd2lk dGggKiBtZXRyaWNzTXVsdGlwbGllcjsKIH0KIAotdm9pZCBTaW1wbGVGb250RGF0YTo6c2V0Rm9u dChjYWlyb190KiBjcikgY29uc3QKLXsKLSAgICBBU1NFUlQoY3IpOwotICAgIG1fcGxhdGZvcm1E YXRhLnNldEZvbnQoY3IpOwotfQotCiB9