50676 2010-12-08 03:24:29 -0800 [GTK] Layering violation in ContextMenuGtk.cpp 2010-12-08 11:17:45 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 50586 1 mrobinson webkit-unassigned bweinstein sullivan oldest_to_newest 318711 0 mrobinson 2010-12-08 03:24:29 -0800 ContextMenuGtk shouldn't know about ContextMenuController. This is a companion fix to http://trac.webkit.org/changeset/73469 . 318712 1 75884 mrobinson 2010-12-08 03:30:30 -0800 Created attachment 75884 Patch for this issue 318745 2 75884 sullivan 2010-12-08 05:52:43 -0800 Comment on attachment 75884 Patch for this issue View in context: https://bugs.webkit.org/attachment.cgi?id=75884&action=review > WebKit/gtk/webkit/webkitwebview.cpp:268 > +static void popupMenuItemActivated(GtkMenuItem* item, ContextMenuController* controller) To keep the terminology consistent, I suggest using "contextMenu" rather than "popupMenu" in the name of this function. 318902 3 mrobinson 2010-12-08 11:17:45 -0800 Committed r73534: <http://trac.webkit.org/changeset/73534> 75884 2010-12-08 03:30:30 -0800 2010-12-08 05:52:43 -0800 Patch for this issue bug-50676-20101208123027.patch text/plain 6510 mrobinson ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MjdhNGE2MzU2ZDU4M2VjOTIyYmI4OGEzMzYyZGU5MDdhYjY5NzY3Yy4uMDk4ODZiZjdjM2EzNmI3 OGRiYTJkNGM0ODMyOTBhZTliMjc4YzIyOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0xMi0wOCAgTWFy dGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gTGF5ZXJpbmcgdmlvbGF0aW9uIGlu IENvbnRleHRNZW51R3RrLmNwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTA2NzYKKworICAgICAgICBDb250ZXh0TWVudUd0ayBhY2Nlc3NlcyB0aGUg cGFnZSdzIENvbnRleHRNZW51Q29udHJvbGxlciwgd2hpY2ggaXMgYSBsYXllcmluZworICAgICAg ICB2aW9sYXRpb24uIFRoaXMgd2FzIGZpeGVkIGZvciBNYWMgd2l0aCBjaGFuZ2UgcjczNDY5LiBX ZSBtYWtlIGEgc2ltaWxhciBmaXggaGVyZQorICAgICAgICBieSBtb3ZpbmcgdGhlICJhY3RpdmF0 ZWQiIHNpZ25hbCBjb25uZWN0aW9uIHRvIHRoZSBXZWJLaXQgbGF5ZXIuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ndGsvQ29udGV4dE1lbnVHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGV4 dE1lbnU6OmFwcGVuZEl0ZW0pOiBSZW1vdmUgYWNjZXNzIG9mIENvbnRleHRNZW51Q29udHJvbGxl ci4gVGhpcworICAgICAgICBpcyBhIGxheWVyaW5nIHZpb2xhdGlvbi4KKwogMjAxMC0xMi0wNyAg UGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgR3VzdGF2byBOb3JvbmhhIFNpbHZhLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvQ29udGV4dE1lbnVHdGsuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvQ29udGV4dE1l bnVHdGsuY3BwCmluZGV4IDIxMGNmYTY5ZWI1NzUwMjM0MDU1YTg0NzBjYTZjZWQ2ZjZkZjYyNjcu LjMxNDQ5YmNkMWRhZDA2MjJiMWM4YzlmZjkxYWUwYWFkMDAyMTNhOTEgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvcGxhdGZvcm0vZ3RrL0NvbnRleHRNZW51R3RrLmNwcAorKysgYi9XZWJDb3JlL3BsYXRm b3JtL2d0ay9Db250ZXh0TWVudUd0ay5jcHAKQEAgLTE5LDIxICsxOSwxMCBAQAogI2luY2x1ZGUg ImNvbmZpZy5oIgogI2luY2x1ZGUgIkNvbnRleHRNZW51LmgiCiAKLSNpbmNsdWRlICJDb250ZXh0 TWVudUNvbnRyb2xsZXIuaCIKLQogI2luY2x1ZGUgPGd0ay9ndGsuaD4KIAogbmFtZXNwYWNlIFdl YkNvcmUgewogCi0vLyBUT0RPOiByZWYtY291bnRpbmcgY29ycmVjdG5lc3MgY2hlY2tpbmcuCi0v LyBTZWUgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYxMTUKLQotc3Rh dGljIHZvaWQgbWVudUl0ZW1BY3RpdmF0ZWQoR3RrTWVudUl0ZW0qIGl0ZW0sIENvbnRleHRNZW51 Q29udHJvbGxlciogY29udHJvbGxlcikKLXsKLSAgICBDb250ZXh0TWVudUl0ZW0gY29udGV4dEl0 ZW0oaXRlbSk7Ci0gICAgY29udHJvbGxlci0+Y29udGV4dE1lbnVJdGVtU2VsZWN0ZWQoJmNvbnRl eHRJdGVtKTsKLX0KLQogQ29udGV4dE1lbnU6OkNvbnRleHRNZW51KGNvbnN0IEhpdFRlc3RSZXN1 bHQmIHJlc3VsdCkKICAgICA6IG1faGl0VGVzdFJlc3VsdChyZXN1bHQpCiB7CkBAIC01MywxMyAr NDIsOCBAQCB2b2lkIENvbnRleHRNZW51OjphcHBlbmRJdGVtKENvbnRleHRNZW51SXRlbSYgaXRl bSkKICAgICBBU1NFUlQobV9wbGF0Zm9ybURlc2NyaXB0aW9uKTsKICAgICBjaGVja09yRW5hYmxl SWZOZWVkZWQoaXRlbSk7CiAKLSAgICBDb250ZXh0TWVudUl0ZW1UeXBlIHR5cGUgPSBpdGVtLnR5 cGUoKTsKICAgICBHdGtNZW51SXRlbSogcGxhdGZvcm1JdGVtID0gQ29udGV4dE1lbnVJdGVtOjpj cmVhdGVOYXRpdmVNZW51SXRlbShpdGVtLnJlbGVhc2VQbGF0Zm9ybURlc2NyaXB0aW9uKCkpOwog ICAgIEFTU0VSVChwbGF0Zm9ybUl0ZW0pOwotCi0gICAgaWYgKHR5cGUgPT0gQWN0aW9uVHlwZSB8 fCB0eXBlID09IENoZWNrYWJsZUFjdGlvblR5cGUpCi0gICAgICAgIGdfc2lnbmFsX2Nvbm5lY3Qo cGxhdGZvcm1JdGVtLCAiYWN0aXZhdGUiLCBHX0NBTExCQUNLKG1lbnVJdGVtQWN0aXZhdGVkKSwg Y29udHJvbGxlcigpKTsKLQogICAgIGd0a19tZW51X3NoZWxsX2FwcGVuZChHVEtfTUVOVV9TSEVM TChtX3BsYXRmb3JtRGVzY3JpcHRpb24pLCBHVEtfV0lER0VUKHBsYXRmb3JtSXRlbSkpOwogICAg IGd0a193aWRnZXRfc2hvdyhHVEtfV0lER0VUKHBsYXRmb3JtSXRlbSkpOwogfQpkaWZmIC0tZ2l0 IGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCBmZTlm YTVhY2Y3ZjU1NTBhNTU4M2U4NDc3ZGFhZThkMjBhNmYyMDhiLi41YjJkOThjZDA0NjliZDkyOTBm ZGQ3NzQ2ODIxZDJmOWQzNDNkMDAwIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwor KysgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEwLTEyLTA4ICBN YXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1RLXSBMYXllcmluZyB2aW9sYXRpb24g aW4gQ29udGV4dE1lbnVHdGsuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01MDY3NgorCisgICAgICAgIENvbnRleHRNZW51R3RrIGFjY2Vzc2VzIHRo ZSBwYWdlJ3MgQ29udGV4dE1lbnVDb250cm9sbGVyLCB3aGljaCBpcyBhIGxheWVyaW5nCisgICAg ICAgIHZpb2xhdGlvbi4gVGhpcyB3YXMgZml4ZWQgZm9yIE1hYyB3aXRoIGNoYW5nZSByNzM0Njku IFdlIG1ha2UgYSBzaW1pbGFyIGZpeCBoZXJlCisgICAgICAgIGJ5IG1vdmluZyB0aGUgImFjdGl2 YXRlZCIgc2lnbmFsIGNvbm5lY3Rpb24gdG8gdGhlIFdlYktpdCBsYXllci4KKworICAgICAgICAq IHdlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKHBvcHVwTWVudUl0ZW1BY3RpdmF0 ZWQpOiBIYXZlIENvbnRleHRNZW51Q29udHJvbGxlciBoYW5kbGUgdGhpcyBzaWduYWwuCisgICAg ICAgICh3ZWJraXRfd2ViX3ZpZXdfZm9yd2FyZF9jb250ZXh0X21lbnVfZXZlbnQpOiBGb3IgYWxs IGl0ZW1zIGluIHRoZSB1bnRvdWNoZWQKKyAgICAgICAgY29udGV4dCBtZW51LCBjb25uZWN0IHRo ZWlyICJhY3RpdmF0ZWQiIHNpZ25hbCB0byB0aGUgbmV3IHBvcHVwTWVudUl0ZW1BY3RpdmF0ZWQK KyAgICAgICAgaGFuZGxlci4KKwogMjAxMC0xMi0wNyAgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8 Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9yYS5jby51az4KIAogICAgICAgICBSZXZpZXdlZCBieSBY YW4gTG9wZXouCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNw cCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IDU1OTkwNmEyMDZk NWY2ZWMyZGI0NTEzNjEyZWEzOTJlYjg4M2FhZDUuLjJhY2RiMGQwMDZiZWNiYWI5NjM0ZjY2YWVj YzhlMzZhMThlOWQ1ZWIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZp ZXcuY3BwCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC0yNjUs NiArMjY1LDEyIEBAIHN0YXRpYyBOb2RlKiBnZXRGb2N1c2VkTm9kZShGcmFtZSogZnJhbWUpCiAg ICAgcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyB2b2lkIHBvcHVwTWVudUl0ZW1BY3RpdmF0ZWQoR3Rr TWVudUl0ZW0qIGl0ZW0sIENvbnRleHRNZW51Q29udHJvbGxlciogY29udHJvbGxlcikKK3sKKyAg ICBDb250ZXh0TWVudUl0ZW0gY29udGV4dEl0ZW0oaXRlbSk7CisgICAgY29udHJvbGxlci0+Y29u dGV4dE1lbnVJdGVtU2VsZWN0ZWQoJmNvbnRleHRJdGVtKTsKK30KKwogc3RhdGljIGdib29sZWFu IHdlYmtpdF93ZWJfdmlld19mb3J3YXJkX2NvbnRleHRfbWVudV9ldmVudChXZWJLaXRXZWJWaWV3 KiB3ZWJWaWV3LCBjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmIGV2ZW50KQogewogICAgIFBhZ2Uq IHBhZ2UgPSBjb3JlKHdlYlZpZXcpOwpAQCAtMzA1LDcgKzMxMSw4IEBAIHN0YXRpYyBnYm9vbGVh biB3ZWJraXRfd2ViX3ZpZXdfZm9yd2FyZF9jb250ZXh0X21lbnVfZXZlbnQoV2ViS2l0V2ViVmll dyogd2ViVmllCiAgICAgLy8gSWYgY29yZU1lbnUgaXMgTlVMTCwgdGhpcyBtZWFucyBXZWJDb3Jl IGRlY2lkZWQgdG8gbm90IGNyZWF0ZQogICAgIC8vIHRoZSBkZWZhdWx0IGNvbnRleHQgbWVudTsg dGhpcyBtYXkgaGFwcGVuIHdoZW4gdGhlIHBhZ2UgaXMKICAgICAvLyBoYW5kbGluZyB0aGUgcmln aHQtY2xpY2sgZm9yIHJlYXNvbnMgb3RoZXIgdGhhbiB0aGUgY29udGV4dCBtZW51LgotICAgIENv bnRleHRNZW51KiBjb3JlTWVudSA9IHBhZ2UtPmNvbnRleHRNZW51Q29udHJvbGxlcigpLT5jb250 ZXh0TWVudSgpOworICAgIENvbnRleHRNZW51Q29udHJvbGxlciogY29udHJvbGxlciA9IHBhZ2Ut PmNvbnRleHRNZW51Q29udHJvbGxlcigpOworICAgIENvbnRleHRNZW51KiBjb3JlTWVudSA9IGNv bnRyb2xsZXItPmNvbnRleHRNZW51KCk7CiAgICAgaWYgKCFjb3JlTWVudSkKICAgICAgICAgcmV0 dXJuIG1vdXNlUHJlc3NFdmVudFJlc3VsdDsKIApAQCAtMzIzLDEyICszMzAsMjIgQEAgc3RhdGlj IGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19mb3J3YXJkX2NvbnRleHRfbWVudV9ldmVudChXZWJL aXRXZWJWaWV3KiB3ZWJWaWUKICAgICBpZiAoIW1lbnUpCiAgICAgICAgIHJldHVybiBGQUxTRTsK IAorICAgIC8vIFdlIGNvbm5lY3QgdGhlICJhY3RpdmF0ZSIgc2lnbmFsIGhlcmUgcmF0aGVyIHRo YW4gaW4gQ29udGV4dE1lbnVHdGsgdG8gYXZvaWQKKyAgICAvLyBhIGxheWVyaW5nIHZpb2xhdGlv bi4gQ29udGV4dE1lbnVHdGsgc2hvdWxkIG5vdCBrbm93IGFib3V0IHRoZSBDb250ZXh0TWVudUNv bnRyb2xsZXIuCisgICAgR093blB0cjxHTGlzdD4gaXRlbXMoZ3RrX2NvbnRhaW5lcl9nZXRfY2hp bGRyZW4oR1RLX0NPTlRBSU5FUihtZW51KSkpOworICAgIEdMaXN0KiBjdXJyZW50TGlzdEl0ZW0g PSBpdGVtcy5nZXQoKTsKKyAgICB3aGlsZSAoY3VycmVudExpc3RJdGVtKSB7CisgICAgICAgIEd0 a01lbnVJdGVtKiBpdGVtID0gR1RLX01FTlVfSVRFTShjdXJyZW50TGlzdEl0ZW0tPmRhdGEpOwor ICAgICAgICBpZiAoIUdUS19JU19TRVBBUkFUT1JfTUVOVV9JVEVNKGl0ZW0pICYmICFndGtfbWVu dV9pdGVtX2dldF9zdWJtZW51KGl0ZW0pKQorICAgICAgICAgICAgZ19zaWduYWxfY29ubmVjdChp dGVtLCAiYWN0aXZhdGUiLCBHX0NBTExCQUNLKHBvcHVwTWVudUl0ZW1BY3RpdmF0ZWQpLCBjb250 cm9sbGVyKTsKKyAgICAgICAgY3VycmVudExpc3RJdGVtID0gY3VycmVudExpc3RJdGVtLT5uZXh0 OworICAgIH0KKwogICAgIGdfc2lnbmFsX2VtaXQod2ViVmlldywgd2Via2l0X3dlYl92aWV3X3Np Z25hbHNbUE9QVUxBVEVfUE9QVVBdLCAwLCBtZW51KTsKIAotICAgIEdMaXN0KiBpdGVtcyA9IGd0 a19jb250YWluZXJfZ2V0X2NoaWxkcmVuKEdUS19DT05UQUlORVIobWVudSkpOwotICAgIGJvb2wg ZW1wdHkgPSAhZ19saXN0X250aChpdGVtcywgMCk7Ci0gICAgZ19saXN0X2ZyZWUoaXRlbXMpOwot ICAgIGlmIChlbXB0eSkKKyAgICAvLyBJZiB0aGUgY29udGV4dCBtZW51IGlzIG5vdyBlbXB0eSwg ZG9uJ3Qgc2hvdyBpdC4KKyAgICBpdGVtcy5zZXQoZ3RrX2NvbnRhaW5lcl9nZXRfY2hpbGRyZW4o R1RLX0NPTlRBSU5FUihtZW51KSkpOworICAgIGlmICghaXRlbXMpCiAgICAgICAgIHJldHVybiBG QUxTRTsKIAogICAgIFdlYktpdFdlYlZpZXdQcml2YXRlKiBwcml2ID0gV0VCS0lUX1dFQl9WSUVX X0dFVF9QUklWQVRFKHdlYlZpZXcpOwpAQCAtMzM2LDkgKzM1Myw3IEBAIHN0YXRpYyBnYm9vbGVh biB3ZWJraXRfd2ViX3ZpZXdfZm9yd2FyZF9jb250ZXh0X21lbnVfZXZlbnQoV2ViS2l0V2ViVmll dyogd2ViVmllCiAgICAgcHJpdi0+bGFzdFBvcHVwWFBvc2l0aW9uID0gZXZlbnQuZ2xvYmFsWCgp OwogICAgIHByaXYtPmxhc3RQb3B1cFlQb3NpdGlvbiA9IGV2ZW50Lmdsb2JhbFkoKTsKIAotICAg IGd0a19tZW51X3BvcHVwKG1lbnUsIE5VTEwsIE5VTEwsCi0gICAgICAgICAgICAgICAgICAgJlBv cHVwTWVudVBvc2l0aW9uRnVuYywKLSAgICAgICAgICAgICAgICAgICB3ZWJWaWV3LCBldmVudC5i dXR0b24oKSArIDEsIGd0a19nZXRfY3VycmVudF9ldmVudF90aW1lKCkpOworICAgIGd0a19tZW51 X3BvcHVwKG1lbnUsIDAsIDAsICZQb3B1cE1lbnVQb3NpdGlvbkZ1bmMsIHdlYlZpZXcsIGV2ZW50 LmJ1dHRvbigpICsgMSwgZ3RrX2dldF9jdXJyZW50X2V2ZW50X3RpbWUoKSk7CiAgICAgcmV0dXJu IFRSVUU7CiB9CiAK