96770 2012-09-14 06:49:14 -0700 [GTK] Don't use the C API internally in WebKitContextMenu 2012-10-17 08:52:28 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 96769 96766 96772 1 cgarcia webkit-unassigned mario oldest_to_newest 720696 0 cgarcia 2012-09-14 06:49:14 -0700 Use the C++ classes instead. 720698 1 164130 cgarcia 2012-09-14 06:50:46 -0700 Created attachment 164130 Patch 733432 2 164130 mario 2012-10-03 01:32:43 -0700 Comment on attachment 164130 Patch Looks good to me 744279 3 cgarcia 2012-10-17 08:52:28 -0700 Committed r131606: <http://trac.webkit.org/changeset/131606> 164130 2012-09-14 06:50:46 -0700 2012-10-17 06:01:29 -0700 Patch wk2-no-c-api-context-menu.diff text/plain 6691 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmZjY2M2ZiLi4xYThkZTY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTItMDktMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIERvbid0IHVzZSB0aGUgQyBBUEkgaW50ZXJuYWxseSBpbiBXZWJL aXRDb250ZXh0TWVudQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTY3NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBVc2luZyB0aGUgQysrIGNsYXNzZXMgZGlyZWN0bHkgaW5zdGVhZCBvZiB0aGUgQyBBUEkg d3JhcHBlcnMgd2UKKyAgICAgICAgYXZvaWQgYSBsb3Qgb2YgdG9JbXBsL3RvQVBJIGNhc3RzLCBz dHJpbmcgY29udmVyc2lvbnMgYW5kCisgICAgICAgIGFsbG9jYXRpb25zLiBUaGUgY29kZSBpcyBh bHNvIGEgbG90IHNpbXBsZXIgYW5kIGVhc2llciB0byByZWFkLgorCisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0Q29udGV4dE1lbnUuY3BwOgorICAgICAgICAod2Via2l0Q29udGV4 dE1lbnVDcmVhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRN ZW51SXRlbS5jcHA6CisgICAgICAgICh3ZWJraXRDb250ZXh0TWVudUl0ZW1DcmVhdGUpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51SXRlbVByaXZhdGUuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudVByaXZhdGUuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcDoKKyAgICAgICAg KHdlYmtpdFdlYlZpZXdQb3B1bGF0ZUNvbnRleHRNZW51KToKKwogMjAxMi0wOS0xMiAgU2hlcmlm ZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcm9sbGluZyBvdXQgcjEyNzg3Ni4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51LmNwcAppbmRleCBmMDVmYmY5Li41MTBjMjVk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb250 ZXh0TWVudS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 Q29udGV4dE1lbnUuY3BwCkBAIC0yMCwxMCArMjAsMTEgQEAKICNpbmNsdWRlICJjb25maWcuaCIK ICNpbmNsdWRlICJXZWJLaXRDb250ZXh0TWVudS5oIgogCisjaW5jbHVkZSAiSW1tdXRhYmxlQXJy YXkuaCIKKyNpbmNsdWRlICJXZWJDb250ZXh0TWVudUl0ZW0uaCIKICNpbmNsdWRlICJXZWJLaXRD b250ZXh0TWVudUl0ZW1Qcml2YXRlLmgiCiAjaW5jbHVkZSAiV2ViS2l0Q29udGV4dE1lbnVQcml2 YXRlLmgiCiAKLXVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29y ZTsKIAogc3RydWN0IF9XZWJLaXRDb250ZXh0TWVudVByaXZhdGUgewpAQCAtNjQsMTIgKzY1LDEy IEBAIHZvaWQgd2Via2l0Q29udGV4dE1lbnVQb3B1bGF0ZShXZWJLaXRDb250ZXh0TWVudSogbWVu dSwgVmVjdG9yPENvbnRleHRNZW51SXRlbT4mCiAgICAgfQogfQogCi1XZWJLaXRDb250ZXh0TWVu dSogd2Via2l0Q29udGV4dE1lbnVDcmVhdGUoV0tBcnJheVJlZiB3a0l0ZW1zKQorV2ViS2l0Q29u dGV4dE1lbnUqIHdlYmtpdENvbnRleHRNZW51Q3JlYXRlKEltbXV0YWJsZUFycmF5KiBpdGVtcykK IHsKICAgICBXZWJLaXRDb250ZXh0TWVudSogbWVudSA9IHdlYmtpdF9jb250ZXh0X21lbnVfbmV3 KCk7Ci0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBXS0FycmF5R2V0U2l6ZSh3a0l0ZW1zKTsg KytpKSB7Ci0gICAgICAgIFdLQ29udGV4dE1lbnVJdGVtUmVmIHdrSXRlbSA9IHN0YXRpY19jYXN0 PFdLQ29udGV4dE1lbnVJdGVtUmVmPihXS0FycmF5R2V0SXRlbUF0SW5kZXgod2tJdGVtcywgaSkp OwotICAgICAgICB3ZWJraXRfY29udGV4dF9tZW51X3ByZXBlbmQobWVudSwgd2Via2l0Q29udGV4 dE1lbnVJdGVtQ3JlYXRlKHdrSXRlbSkpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgaXRl bXMtPnNpemUoKTsgKytpKSB7CisgICAgICAgIFdlYkNvbnRleHRNZW51SXRlbSogaXRlbSA9IHN0 YXRpY19jYXN0PFdlYkNvbnRleHRNZW51SXRlbSo+KGl0ZW1zLT5hdChpKSk7CisgICAgICAgIHdl YmtpdF9jb250ZXh0X21lbnVfcHJlcGVuZChtZW51LCB3ZWJraXRDb250ZXh0TWVudUl0ZW1DcmVh dGUoaXRlbSkpOwogICAgIH0KICAgICBtZW51LT5wcml2LT5pdGVtcyA9IGdfbGlzdF9yZXZlcnNl KG1lbnUtPnByaXYtPml0ZW1zKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0Q29udGV4dE1lbnVJdGVtLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51SXRlbS5jcHAKaW5kZXggYjJiMjJmZS4u MDg4N2Y3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0Q29udGV4dE1lbnVJdGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRDb250ZXh0TWVudUl0ZW0uY3BwCkBAIC0zNCw3ICszNCw2IEBACiAjaW5jbHVk ZSA8d3RmL2dvYmplY3QvR093blB0ci5oPgogI2luY2x1ZGUgPHd0Zi9nb2JqZWN0L0dSZWZQdHIu aD4KIAotdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwog CiBzdHJ1Y3QgX1dlYktpdENvbnRleHRNZW51SXRlbVByaXZhdGUgewpAQCAtOTEsMTAgKzkwLDEw IEBAIHN0YXRpYyB2b2lkIHdlYmtpdENvbnRleHRNZW51SXRlbVNldFN1Yk1lbnUoV2ViS2l0Q29u dGV4dE1lbnVJdGVtKiBpdGVtLCBHUmVmUHRyCiAgICAgICAgIHdlYmtpdENvbnRleHRNZW51U2V0 UGFyZW50SXRlbShzdWJNZW51LmdldCgpLCBpdGVtKTsKIH0KIAotV2ViS2l0Q29udGV4dE1lbnVJ dGVtKiB3ZWJraXRDb250ZXh0TWVudUl0ZW1DcmVhdGUoV0tDb250ZXh0TWVudUl0ZW1SZWYgd2tJ dGVtKQorV2ViS2l0Q29udGV4dE1lbnVJdGVtKiB3ZWJraXRDb250ZXh0TWVudUl0ZW1DcmVhdGUo V2ViQ29udGV4dE1lbnVJdGVtKiB3ZWJJdGVtKQogewogICAgIFdlYktpdENvbnRleHRNZW51SXRl bSogaXRlbSA9IFdFQktJVF9DT05URVhUX01FTlVfSVRFTShnX29iamVjdF9uZXcoV0VCS0lUX1RZ UEVfQ09OVEVYVF9NRU5VX0lURU0sIE5VTEwpKTsKLSAgICBXZWJDb250ZXh0TWVudUl0ZW1EYXRh KiBpdGVtRGF0YSA9IHRvSW1wbCh3a0l0ZW0pLT5kYXRhKCk7CisgICAgV2ViQ29udGV4dE1lbnVJ dGVtRGF0YSogaXRlbURhdGEgPSB3ZWJJdGVtLT5kYXRhKCk7CiAgICAgaXRlbS0+cHJpdi0+bWVu dUl0ZW0gPSBXVEY6OmFkb3B0UHRyKG5ldyBDb250ZXh0TWVudUl0ZW0oaXRlbURhdGEtPnR5cGUo KSwgaXRlbURhdGEtPmFjdGlvbigpLCBpdGVtRGF0YS0+dGl0bGUoKSwgaXRlbURhdGEtPmVuYWJs ZWQoKSwgaXRlbURhdGEtPmNoZWNrZWQoKSkpOwogICAgIGNvbnN0IFZlY3RvcjxXZWJDb250ZXh0 TWVudUl0ZW1EYXRhPiYgc3ViTWVudSA9IGl0ZW1EYXRhLT5zdWJtZW51KCk7CiAgICAgaWYgKCFz dWJNZW51LnNpemUoKSkKQEAgLTEwNCw3ICsxMDMsNyBAQCBXZWJLaXRDb250ZXh0TWVudUl0ZW0q IHdlYmtpdENvbnRleHRNZW51SXRlbUNyZWF0ZShXS0NvbnRleHRNZW51SXRlbVJlZiB3a0l0ZW0p CiAgICAgc3ViTWVudUl0ZW1zLT5yZXNlcnZlQ2FwYWNpdHkoc3ViTWVudS5zaXplKCkpOwogICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc3ViTWVudS5zaXplKCk7ICsraSkKICAgICAgICAgc3Vi TWVudUl0ZW1zLT5hcHBlbmQoV2ViQ29udGV4dE1lbnVJdGVtOjpjcmVhdGUoc3ViTWVudVtpXSku Z2V0KCkpOwotICAgIHdlYmtpdENvbnRleHRNZW51SXRlbVNldFN1Yk1lbnUoaXRlbSwgYWRvcHRH UmVmKHdlYmtpdENvbnRleHRNZW51Q3JlYXRlKHRvQVBJKHN1Yk1lbnVJdGVtcy5nZXQoKSkpKSk7 CisgICAgd2Via2l0Q29udGV4dE1lbnVJdGVtU2V0U3ViTWVudShpdGVtLCBhZG9wdEdSZWYod2Vi a2l0Q29udGV4dE1lbnVDcmVhdGUoc3ViTWVudUl0ZW1zLmdldCgpKSkpOwogCiAgICAgcmV0dXJu IGl0ZW07CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRDb250ZXh0TWVudUl0ZW1Qcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudUl0ZW1Qcml2YXRlLmgKaW5kZXggOWM4ODAwMy4uMDIy ZmNlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 Q29udGV4dE1lbnVJdGVtUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdENvbnRleHRNZW51SXRlbVByaXZhdGUuaApAQCAtMjMsNyArMjMsOSBAQAog I2luY2x1ZGUgIldlYktpdENvbnRleHRNZW51SXRlbS5oIgogI2luY2x1ZGUgIldlYktpdFByaXZh dGUuaCIKIAotV2ViS2l0Q29udGV4dE1lbnVJdGVtKiB3ZWJraXRDb250ZXh0TWVudUl0ZW1DcmVh dGUoV0tDb250ZXh0TWVudUl0ZW1SZWYpOwordXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKKworV2Vi S2l0Q29udGV4dE1lbnVJdGVtKiB3ZWJraXRDb250ZXh0TWVudUl0ZW1DcmVhdGUoV2ViQ29udGV4 dE1lbnVJdGVtKik7CiBHdGtNZW51SXRlbSogd2Via2l0Q29udGV4dE1lbnVJdGVtUmVsZWFzZShX ZWJLaXRDb250ZXh0TWVudUl0ZW0qKTsKIHZvaWQgd2Via2l0Q29udGV4dE1lbnVJdGVtU2V0U3Vi TWVudUZyb21HdGtNZW51KFdlYktpdENvbnRleHRNZW51SXRlbSosIEd0a01lbnUqKTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29udGV4dE1l bnVQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb250 ZXh0TWVudVByaXZhdGUuaAppbmRleCA2ZDNmMTgwMS4uM2EzOWRmZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29udGV4dE1lbnVQcml2YXRlLmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29udGV4dE1lbnVQ cml2YXRlLmgKQEAgLTIzLDcgKzIzLDkgQEAKICNpbmNsdWRlICJXZWJLaXRDb250ZXh0TWVudS5o IgogI2luY2x1ZGUgIldlYktpdFByaXZhdGUuaCIKIAotV2ViS2l0Q29udGV4dE1lbnUqIHdlYmtp dENvbnRleHRNZW51Q3JlYXRlKFdLQXJyYXlSZWYgd2tJdGVtcyk7Cit1c2luZyBuYW1lc3BhY2Ug V2ViS2l0OworCitXZWJLaXRDb250ZXh0TWVudSogd2Via2l0Q29udGV4dE1lbnVDcmVhdGUoSW1t dXRhYmxlQXJyYXkqIGl0ZW1zKTsKIHZvaWQgd2Via2l0Q29udGV4dE1lbnVQb3B1bGF0ZShXZWJL aXRDb250ZXh0TWVudSosIFZlY3RvcjxXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW0+Jik7CiB2b2lk IHdlYmtpdENvbnRleHRNZW51U2V0UGFyZW50SXRlbShXZWJLaXRDb250ZXh0TWVudSosIFdlYktp dENvbnRleHRNZW51SXRlbSopOwogV2ViS2l0Q29udGV4dE1lbnVJdGVtKiB3ZWJraXRDb250ZXh0 TWVudUdldFBhcmVudEl0ZW0oV2ViS2l0Q29udGV4dE1lbnUqKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKaW5kZXggYjZiNDhkMC4u MTIxYWM0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0V2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0V2ViVmlldy5jcHAKQEAgLTE0MjIsNyArMTQyMiw3IEBAIHZvaWQgd2Via2l0V2ViVmlld1Bv cHVsYXRlQ29udGV4dE1lbnUoV2ViS2l0V2ViVmlldyogd2ViVmlldywgSW1tdXRhYmxlQXJyYXkq IHByCiAgICAgV2ViQ29udGV4dE1lbnVQcm94eUd0ayogY29udGV4dE1lbnVQcm94eSA9IHdlYmtp dFdlYlZpZXdCYXNlR2V0QWN0aXZlQ29udGV4dE1lbnVQcm94eSh3ZWJWaWV3QmFzZSk7CiAgICAg QVNTRVJUKGNvbnRleHRNZW51UHJveHkpOwogCi0gICAgR1JlZlB0cjxXZWJLaXRDb250ZXh0TWVu dT4gY29udGV4dE1lbnUgPSBhZG9wdEdSZWYod2Via2l0Q29udGV4dE1lbnVDcmVhdGUodG9BUEko cHJvcG9zZWRNZW51KSkpOworICAgIEdSZWZQdHI8V2ViS2l0Q29udGV4dE1lbnU+IGNvbnRleHRN ZW51ID0gYWRvcHRHUmVmKHdlYmtpdENvbnRleHRNZW51Q3JlYXRlKHByb3Bvc2VkTWVudSkpOwog ICAgIGlmICh3ZWJIaXRUZXN0UmVzdWx0LT5pc0NvbnRlbnRFZGl0YWJsZSgpKQogICAgICAgICB3 ZWJraXRXZWJWaWV3Q3JlYXRlQW5kQXBwZW5kSW5wdXRNZXRob2RzTWVudUl0ZW0od2ViVmlldywg Y29udGV4dE1lbnUuZ2V0KCkpOwogCg==