47483 2010-10-11 00:13:18 -0700 compile fail with gtk >= 2.22 2010-10-15 01:34:49 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 halton.huo webkit-unassigned alex mrobinson oldest_to_newest 292434 0 halton.huo 2010-10-11 00:13:18 -0700 ../../WebCore/platform/graphics/gtk/FontGtk.cpp: In member function ‘void WebCore::Font::drawComplexText(WebCore::GraphicsContext*, const WebCore::TextRun&, const WebCore::FloatPoint&, int, int) const’: ../../WebCore/platform/graphics/gtk/FontGtk.cpp:234: error: ‘gdk_region_shrink’ was not declared in this scope make[1]: *** [WebCore/platform/graphics/gtk/libwebkitgtk_1_0_la-FontGtk.lo] Error 1 make[1]: Leaving directory `/home/halton/work/projects/meego/WebKit/WebKitBuild/Debug' 294301 1 70766 alex 2010-10-14 12:59:58 -0700 Created attachment 70766 Proposed patch 294304 2 70766 mrobinson 2010-10-14 13:11:39 -0700 Comment on attachment 70766 Proposed patch Great. If this causes issues we can re-add it with a comment explaining why it is useful. 294638 3 alex 2010-10-15 01:34:49 -0700 Landed, http://trac.webkit.org/changeset/69845 70766 2010-10-14 12:59:58 -0700 2010-10-14 13:11:39 -0700 Proposed patch complex_fonts.patch text/plain 4090 alex Y29tbWl0IDU3MWQ4OGMyMzMwZjg2ZjY3ODUxOGVhYjE4OGU5NjFhMWIxZGRhYWMKQXV0aG9yOiBB bGVqYW5kcm8gRy4gQ2FzdHJvIDxhbGV4QGlnYWxpYS5jb20+CkRhdGU6ICAgVGh1IE9jdCAxNCAw OToxMTo1OSAyMDEwICswMjAwCgogICAgMjAxMC0xMC0xNCAgQWxlamFuZHJvIEcuIENhc3RybyAg PGFsZXhAaWdhbGlhLmNvbT4KICAgIAogICAgICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KICAgIAogICAgICAgICAgICBjb21waWxlIGZhaWwgd2l0aCBndGsgPj0gMi4yMgogICAg ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDc0ODMKICAg IAogICAgICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0ay9Gb250R3RrLmNwcDogUmVtb3Zl ZCB0aGUgc2hyaW5rIG9wZXJhdGlvbiwKICAgICAgICAgICAgaXQgd2FzIGFkZGVkIGxvbmcgdGlt ZSBhZ28gYW5kIGN1cnJlbnRseSBpdCBpcyBub3QgYWRkaW5nIGFueSByZWFsCiAgICAgICAgICAg IGFyZWEgdG8gdGhlIGNsaXAgdmVydGljYWxseSwgYWN0dWFsbHkgdGhlIGd0azMgc2hyaW5rIHZl cnNpb24gZGlkCiAgICAgICAgICAgIG5vdCB3b3JrLgogICAgICAgICAgICAoV2ViQ29yZTo6Rm9u dDo6ZHJhd0NvbXBsZXhUZXh0KToKICAgICAgICAgICAgKiBwbGF0Zm9ybS9ndGsvZ3RrMmRyYXdp bmcuYzogVW5kZWYgdGhlIGRlcHJlY2F0aW9uIGZsYWdzLCB0aGlzCiAgICAgICAgICAgIGZpbGUg aXMgZnVsbCBvZiBndGsyIHN0dWZmLCBhbmQgaXQgZG9lcyBub3Qgc2VlbSBpbnRlcmVzdGluZyB0 bwogICAgICAgICAgICB1cGdyYWRlIGJlY2F1c2Ugd2UgYXJlIGFscmVhZHkgY3JlYXRpbmcgYSBu ZXcgdmVyc2lvbiBvZiB0aGUgZmlsZQogICAgICAgICAgICBmb3IgZ3RrMy4KCmRpZmYgLS1naXQg YS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDMwNzcwMTQuLjlk MGEyMGQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMTAtMTQgIEFsZWphbmRybyBHLiBDYXN0cm8gIDxh bGV4QGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgY29tcGlsZSBmYWlsIHdpdGggZ3RrID49IDIuMjIKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3NDgzCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9ndGsvRm9udEd0ay5jcHA6IFJlbW92ZWQgdGhlIHNocmluayBvcGVyYXRpb24s CisgICAgICAgIGl0IHdhcyBhZGRlZCBsb25nIHRpbWUgYWdvIGFuZCBjdXJyZW50bHkgaXQgaXMg bm90IGFkZGluZyBhbnkgcmVhbAorICAgICAgICBhcmVhIHRvIHRoZSBjbGlwIHZlcnRpY2FsbHks IGFjdHVhbGx5IHRoZSBndGszIHNocmluayB2ZXJzaW9uIGRpZAorICAgICAgICBub3Qgd29yay4K KyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OmRyYXdDb21wbGV4VGV4dCk6CisgICAgICAgICogcGxh dGZvcm0vZ3RrL2d0azJkcmF3aW5nLmM6IFVuZGVmIHRoZSBkZXByZWNhdGlvbiBmbGFncywgdGhp cworICAgICAgICBmaWxlIGlzIGZ1bGwgb2YgZ3RrMiBzdHVmZiwgYW5kIGl0IGRvZXMgbm90IHNl ZW0gaW50ZXJlc3RpbmcgdG8KKyAgICAgICAgdXBncmFkZSBiZWNhdXNlIHdlIGFyZSBhbHJlYWR5 IGNyZWF0aW5nIGEgbmV3IHZlcnNpb24gb2YgdGhlIGZpbGUKKyAgICAgICAgZm9yIGd0azMuCisK IDIwMTAtMTAtMTQgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3RrL0ZvbnRHdGsuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ndGsvRm9udEd0ay5jcHAKaW5kZXggZDViNjk1OS4uZmQwZTA2MiAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvRm9udEd0ay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9ndGsvRm9udEd0ay5jcHAKQEAgLTE4MSwyOSArMTgxLDYgQEAgYm9vbCBG b250OjpjYW5SZXR1cm5GYWxsYmFja0ZvbnRzRm9yQ29tcGxleFRleHQoKQogICAgIHJldHVybiBm YWxzZTsKIH0KIAotI2lmbmRlZiBHVEtfQVBJX1ZFUlNJT05fMgotc3RhdGljIHZvaWQgY2Fpcm9f cmVnaW9uX3NocmluayhjYWlyb19yZWdpb25fdCogcmVnaW9uLCBpbnQgZHgsIGludCBkeSkKLXsK LSAgICBpbnQgblJlY3RzID0gY2Fpcm9fcmVnaW9uX251bV9yZWN0YW5nbGVzKHJlZ2lvbik7Ci0g ICAgLy8gQ2xlYXIgcmVnaW9uLgotICAgIGNhaXJvX3JlZ2lvbl9zdWJ0cmFjdChyZWdpb24sIHJl Z2lvbik7Ci0KLSAgICBmb3IgKGludCBpID0gMDsgaSA8IG5SZWN0czsgaSsrKSB7Ci0gICAgICAg IGNhaXJvX3JlY3RhbmdsZV9pbnRfdCByZWN0OwotICAgICAgICBjYWlyb19yZWdpb25fZ2V0X3Jl Y3RhbmdsZShyZWdpb24sIGksICZyZWN0KTsKLQotICAgICAgICBpZiAocmVjdC53aWR0aCA8PSAy ICogZHggfHwgcmVjdC5oZWlnaHQgPD0gMiAqIGR5KQotICAgICAgICAgICAgY29udGludWU7Ci0K LSAgICAgICAgcmVjdC54ICs9IGR4OwotICAgICAgICByZWN0LnkgKz0gZHk7Ci0gICAgICAgIHJl Y3Qud2lkdGggLT0gMiAqIGR4OwotICAgICAgICByZWN0LmhlaWdodCAtPSAyICogZHk7Ci0gICAg ICAgIGNhaXJvX3JlZ2lvbl91bmlvbl9yZWN0YW5nbGUocmVnaW9uLCAmcmVjdCk7Ci0gICAgfQot fQotI2VuZGlmCi0KIHZvaWQgRm9udDo6ZHJhd0NvbXBsZXhUZXh0KEdyYXBoaWNzQ29udGV4dCog Y29udGV4dCwgY29uc3QgVGV4dFJ1biYgcnVuLCBjb25zdCBGbG9hdFBvaW50JiBwb2ludCwgaW50 IGZyb20sIGludCB0bykgY29uc3QKIHsKICNpZiBkZWZpbmVkKFVTRV9GUkVFVFlQRSkKQEAgLTIz MSwxNyArMjA4LDEzIEBAIHZvaWQgRm9udDo6ZHJhd0NvbXBsZXhUZXh0KEdyYXBoaWNzQ29udGV4 dCogY29udGV4dCwgY29uc3QgVGV4dFJ1biYgcnVuLCBjb25zdCBGCiAjZWxzZQogICAgIGNhaXJv X3JlZ2lvbl90KiBwYXJ0aWFsUmVnaW9uID0gMDsKICNlbmRpZgorCiAgICAgaWYgKHRvIC0gZnJv bSAhPSBydW4ubGVuZ3RoKCkpIHsKICAgICAgICAgLy8gQ2xpcCB0aGUgcmVnaW9uIG9mIHRoZSBy dW4gdG8gYmUgcmVuZGVyZWQKICAgICAgICAgY2hhciogc3RhcnQgPSBnX3V0Zjhfb2Zmc2V0X3Rv X3BvaW50ZXIodXRmOCwgZnJvbSk7CiAgICAgICAgIGNoYXIqIGVuZCA9IGdfdXRmOF9vZmZzZXRf dG9fcG9pbnRlcihzdGFydCwgdG8gLSBmcm9tKTsKICAgICAgICAgaW50IHJhbmdlc1tdID0ge3N0 YXJ0IC0gdXRmOCwgZW5kIC0gdXRmOH07CiAgICAgICAgIHBhcnRpYWxSZWdpb24gPSBnZGtfcGFu Z29fbGF5b3V0X2xpbmVfZ2V0X2NsaXBfcmVnaW9uKGxheW91dExpbmUsIDAsIDAsIHJhbmdlcywg MSk7Ci0jaWZkZWYgR1RLX0FQSV9WRVJTSU9OXzIKLSAgICAgICAgZ2RrX3JlZ2lvbl9zaHJpbmso cGFydGlhbFJlZ2lvbiwgMCwgLXBpeGVsU2l6ZSgpKTsKLSNlbHNlCi0gICAgICAgIGNhaXJvX3Jl Z2lvbl9zaHJpbmsocGFydGlhbFJlZ2lvbiwgMCwgLXBpeGVsU2l6ZSgpKTsKLSNlbmRpZgogICAg IH0KIAogICAgIENvbG9yIGZpbGxDb2xvciA9IGNvbnRleHQtPmZpbGxDb2xvcigpOwpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvZ3RrMmRyYXdpbmcuYyBiL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL2d0azJkcmF3aW5nLmMKaW5kZXggZDJkOGIyMDcuLjJmMmVkYjYgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvcGxhdGZvcm0vZ3RrL2d0azJkcmF3aW5nLmMKKysrIGIvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvZ3RrMmRyYXdpbmcuYwpAQCAtNDYsNiArNDYsOSBAQAogCiAjaWZkZWYgR1RLX0FQSV9W RVJTSU9OXzIKIAorI3VuZGVmIEdUS19ESVNBQkxFX0RFUFJFQ0FURUQKKyN1bmRlZiBHREtfRElT QUJMRV9ERVBSRUNBVEVECisKICNpbmNsdWRlIDxnZGsvZ2RrcHJpdmF0ZS5oPgogI2luY2x1ZGUg Imd0a2RyYXdpbmcuaCIKICNpbmNsdWRlICJHdGtWZXJzaW9uaW5nLmgiCg==