71466 2011-11-03 06:34:16 -0700 [GTK] Add back/forward menus to MiniBrowser using WebKit2 GTK+ API 2011-11-03 10:02:01 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 71461 71447 71474 1 cgarcia webkit-unassigned pnormand xan.lopez oldest_to_newest 495411 0 cgarcia 2011-11-03 06:34:16 -0700 Add a menu to back and forward toolbar buttons. 495415 1 113476 cgarcia 2011-11-03 06:39:12 -0700 Created attachment 113476 Patch 495517 2 113476 mrobinson 2011-11-03 09:14:48 -0700 Comment on attachment 113476 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=113476&action=review > Tools/MiniBrowser/gtk/BrowserWindow.c:101 > + return 0; 0 -> NULL > Tools/MiniBrowser/gtk/BrowserWindow.c:110 > + GtkAction *action = gtk_action_new(uri, title, 0, 0); This is C so the zeros should be NULL, I think. > Tools/MiniBrowser/gtk/BrowserWindow.c:111 > + g_object_set_data_full(G_OBJECT(action), "back-forward-list-item", g_object_ref(item), (GDestroyNotify)g_object_unref); You might not need to cast GDestroyNotify here. Please check before landing. 495570 3 cgarcia 2011-11-03 10:02:01 -0700 Committed r99206: <http://trac.webkit.org/changeset/99206> 113476 2011-11-03 06:39:12 -0700 2011-11-03 09:14:48 -0700 Patch wk2-mb-bf-list.diff text/plain 4830 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxZjAz ZTM5Li5kOWQ0ZDc2IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMjQgQEAKIDIwMTEtMTEtMDMgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCisgICAgICAgIFtHVEtdIEFkZCBiYWNrL2ZvcndhcmQg bWVudXMgdG8gTWluaUJyb3dzZXIgdXNpbmcgV2ViS2l0MiBHVEsrIEFQSQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzE0NjYKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1pbmlCcm93c2VyL2d0ay9Ccm93 c2VyV2luZG93LmM6CisgICAgICAgIChicm93c2VyV2luZG93SGlzdG9yeUl0ZW1BY3RpdmF0ZWQp OiBHbyB0byBzZWxlY3RlZCBiYWNrIGZvcm1hcmQKKyAgICAgICAgbGlzdCBpdGVtIHVzaW5nIHdl YmtpdF93ZWJfdmlld19nb190b19iYWNrX2ZvcndhcmRfbGlzdF9pdGVtKCkKKyAgICAgICAgKGJy b3dzZXJXaW5kb3dDcmVhdGVCYWNrRm9yd2FyZE1lbnUpOiBDcmVhdGUgYSBHdGtNZW51IGZvciB0 aGUKKyAgICAgICAgZ2l2ZW4gR0xpc3Qgb2YgV2ViS2l0QmFja0ZvcndhcmRMaXN0SXRlbXMuCisg ICAgICAgIChicm93c2VyV2luZG93VXBkYXRlTmF2aWdhdGlvbkFjdGlvbnMpOiBFbmFibGUvZGlz YWJsZSBiYWNrIGFuZAorICAgICAgICBmb3J3YXJkIGJ1dHRvbnMgZGVwZW5kaW5nIG9uIHdoZXRo ZXIgaXQncyBwb3NzaWJsZSB0byBnbworICAgICAgICBiYWNrL2ZvcndhcmQuIENyZWF0ZSBhIG1l bnUgZm9yIGJhY2sgYW5kIGZvcndhcmQgdG9vbGJhciBidXR0b25zLgorICAgICAgICAoYmFja0Zv cndhZGxpc3RDaGFuZ2VkKTogQ2FsbCBicm93c2VyV2luZG93VXBkYXRlTmF2aWdhdGlvbkFjdGlv bnMoKS4KKyAgICAgICAgKGJyb3dzZXJXaW5kb3dDb25zdHJ1Y3RlZCk6IENvbm5lY3QgdG8gV2Vi S2l0QmFja0ZvcndhcmRMaXN0CisgICAgICAgIGNoYW5nZWQgc2lnbmFsLgorCisyMDExLTExLTAz ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKwogICAgICAgICBb R1RLXSBSZW1vdmUgR3RrTGF1bmNoZXIyCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD03MTQ0OQogCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9n dGsvQnJvd3NlcldpbmRvdy5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cu YwppbmRleCBhOTg4OTM0Li40NmI5ZDYzIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9n dGsvQnJvd3NlcldpbmRvdy5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2lu ZG93LmMKQEAgLTg2LDYgKzg2LDYyIEBAIHN0YXRpYyB2b2lkIHdlYlZpZXdMb2FkUHJvZ3Jlc3ND aGFuZ2VkKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEdQYXJhbVNwZWMgKnBzcGVjCiAgICAgICAg IGdfdGltZW91dF9hZGQoNTAwLCAoR1NvdXJjZUZ1bmMpcmVzZXRFbnRyeVByb2dyZXNzLCB3aW5k b3ctPnVyaUVudHJ5KTsKIH0KIAorc3RhdGljIHZvaWQgYnJvd3NlcldpbmRvd0hpc3RvcnlJdGVt QWN0aXZhdGVkKEJyb3dzZXJXaW5kb3cgKndpbmRvdywgR3RrQWN0aW9uICphY3Rpb24pCit7Cisg ICAgV2ViS2l0QmFja0ZvcndhcmRMaXN0SXRlbSAqaXRlbSA9IGdfb2JqZWN0X2dldF9kYXRhKEdf T0JKRUNUKGFjdGlvbiksICJiYWNrLWZvcndhcmQtbGlzdC1pdGVtIik7CisgICAgaWYgKCFpdGVt KQorICAgICAgICByZXR1cm47CisKKyAgICB3ZWJraXRfd2ViX3ZpZXdfZ29fdG9fYmFja19mb3J3 YXJkX2xpc3RfaXRlbSh3aW5kb3ctPndlYlZpZXcsIGl0ZW0pOworfQorCitzdGF0aWMgR3RrV2lk Z2V0ICpicm93c2VyV2luZG93Q3JlYXRlQmFja0ZvcndhcmRNZW51KEJyb3dzZXJXaW5kb3cgKndp bmRvdywgR0xpc3QgKmxpc3QpCit7CisgICAgaWYgKCFsaXN0KQorICAgICAgICByZXR1cm4gMDsK KworICAgIEd0a1dpZGdldCAqbWVudSA9IGd0a19tZW51X25ldygpOworICAgIEdMaXN0ICpsaXN0 SXRlbTsKKyAgICBmb3IgKGxpc3RJdGVtID0gbGlzdDsgbGlzdEl0ZW07IGxpc3RJdGVtID0gZ19s aXN0X25leHQobGlzdEl0ZW0pKSB7CisgICAgICAgIFdlYktpdEJhY2tGb3J3YXJkTGlzdEl0ZW0g Kml0ZW0gPSAoV2ViS2l0QmFja0ZvcndhcmRMaXN0SXRlbSAqKWxpc3RJdGVtLT5kYXRhOworICAg ICAgICBjb25zdCBjaGFyICp1cmkgPSB3ZWJraXRfYmFja19mb3J3YXJkX2xpc3RfaXRlbV9nZXRf dXJpKGl0ZW0pOworICAgICAgICBjb25zdCBjaGFyICp0aXRsZSA9IHdlYmtpdF9iYWNrX2Zvcndh cmRfbGlzdF9pdGVtX2dldF90aXRsZShpdGVtKTsKKworICAgICAgICBHdGtBY3Rpb24gKmFjdGlv biA9IGd0a19hY3Rpb25fbmV3KHVyaSwgdGl0bGUsIDAsIDApOworICAgICAgICBnX29iamVjdF9z ZXRfZGF0YV9mdWxsKEdfT0JKRUNUKGFjdGlvbiksICJiYWNrLWZvcndhcmQtbGlzdC1pdGVtIiwg Z19vYmplY3RfcmVmKGl0ZW0pLCAoR0Rlc3Ryb3lOb3RpZnkpZ19vYmplY3RfdW5yZWYpOworICAg ICAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBwZWQoYWN0aW9uLCAiYWN0aXZhdGUiLCBHX0NBTExC QUNLKGJyb3dzZXJXaW5kb3dIaXN0b3J5SXRlbUFjdGl2YXRlZCksIHdpbmRvdyk7CisKKyAgICAg ICAgR3RrV2lkZ2V0ICptZW51SXRlbSA9IGd0a19hY3Rpb25fY3JlYXRlX21lbnVfaXRlbShhY3Rp b24pOworICAgICAgICBnX29iamVjdF91bnJlZihhY3Rpb24pOworCisgICAgICAgIGd0a19tZW51 X3NoZWxsX3ByZXBlbmQoR1RLX01FTlVfU0hFTEwobWVudSksIG1lbnVJdGVtKTsKKyAgICAgICAg Z3RrX3dpZGdldF9zaG93KG1lbnVJdGVtKTsKKyAgICB9CisKKyAgICByZXR1cm4gbWVudTsKK30K Kworc3RhdGljIHZvaWQgYnJvd3NlcldpbmRvd1VwZGF0ZU5hdmlnYXRpb25BY3Rpb25zKEJyb3dz ZXJXaW5kb3cgKndpbmRvdywgV2ViS2l0QmFja0ZvcndhcmRMaXN0ICpiYWNrRm9yd2FkbGlzdCkK K3sKKyAgICBndGtfd2lkZ2V0X3NldF9zZW5zaXRpdmUod2luZG93LT5iYWNrSXRlbSwgd2Via2l0 X3dlYl92aWV3X2Nhbl9nb19iYWNrKHdpbmRvdy0+d2ViVmlldykpOworICAgIGd0a193aWRnZXRf c2V0X3NlbnNpdGl2ZSh3aW5kb3ctPmZvcndhcmRJdGVtLCB3ZWJraXRfd2ViX3ZpZXdfY2FuX2dv X2ZvcndhcmQod2luZG93LT53ZWJWaWV3KSk7CisKKyAgICBHTGlzdCAqbGlzdCA9IHdlYmtpdF9i YWNrX2ZvcndhcmRfbGlzdF9nZXRfYmFja19saXN0X3dpdGhfbGltaXQoYmFja0ZvcndhZGxpc3Qs IDEwKTsKKyAgICBndGtfbWVudV90b29sX2J1dHRvbl9zZXRfbWVudShHVEtfTUVOVV9UT09MX0JV VFRPTih3aW5kb3ctPmJhY2tJdGVtKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBicm93c2VyV2luZG93Q3JlYXRlQmFja0ZvcndhcmRNZW51KHdpbmRvdywgbGlzdCkpOworICAg IGdfbGlzdF9mcmVlKGxpc3QpOworCisgICAgbGlzdCA9IHdlYmtpdF9iYWNrX2ZvcndhcmRfbGlz dF9nZXRfZm9yd2FyZF9saXN0X3dpdGhfbGltaXQoYmFja0ZvcndhZGxpc3QsIDEwKTsKKyAgICBn dGtfbWVudV90b29sX2J1dHRvbl9zZXRfbWVudShHVEtfTUVOVV9UT09MX0JVVFRPTih3aW5kb3ct PmZvcndhcmRJdGVtKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBicm93c2Vy V2luZG93Q3JlYXRlQmFja0ZvcndhcmRNZW51KHdpbmRvdywgbGlzdCkpOworICAgIGdfbGlzdF9m cmVlKGxpc3QpOworfQorCitzdGF0aWMgdm9pZCBiYWNrRm9yd2FkbGlzdENoYW5nZWQoV2ViS2l0 QmFja0ZvcndhcmRMaXN0ICpiYWNrRm9yd2FkbGlzdCwgV2ViS2l0QmFja0ZvcndhcmRMaXN0SXRl bSAqaXRlbUFkZGVkLCBHTGlzdCAqaXRlbXNSZW1vdmVkLCBCcm93c2VyV2luZG93ICp3aW5kb3cp Cit7CisgICAgYnJvd3NlcldpbmRvd1VwZGF0ZU5hdmlnYXRpb25BY3Rpb25zKHdpbmRvdywgYmFj a0ZvcndhZGxpc3QpOworfQorCiBzdGF0aWMgdm9pZCBicm93c2VyV2luZG93RmluYWxpemUoR09i amVjdCAqZ09iamVjdCkKIHsKICAgICBHX09CSkVDVF9DTEFTUyhicm93c2VyX3dpbmRvd19wYXJl bnRfY2xhc3MpLT5maW5hbGl6ZShnT2JqZWN0KTsKQEAgLTE3NSw2ICsyMzEsOSBAQCBzdGF0aWMg dm9pZCBicm93c2VyV2luZG93Q29uc3RydWN0ZWQoR09iamVjdCAqZ09iamVjdCkKICAgICBnX3Np Z25hbF9jb25uZWN0KHdpbmRvdy0+d2ViVmlldywgIm5vdGlmeTo6dXJpIiwgR19DQUxMQkFDSyh3 ZWJWaWV3VVJJQ2hhbmdlZCksIHdpbmRvdyk7CiAgICAgZ19zaWduYWxfY29ubmVjdCh3aW5kb3ct PndlYlZpZXcsICJub3RpZnk6OmVzdGltYXRlZC1sb2FkLXByb2dyZXNzIiwgR19DQUxMQkFDSyh3 ZWJWaWV3TG9hZFByb2dyZXNzQ2hhbmdlZCksIHdpbmRvdyk7CiAKKyAgICBXZWJLaXRCYWNrRm9y d2FyZExpc3QgKmJhY2tGb3J3YWRsaXN0ID0gd2Via2l0X3dlYl92aWV3X2dldF9iYWNrX2Zvcndh cmRfbGlzdCh3aW5kb3ctPndlYlZpZXcpOworICAgIGdfc2lnbmFsX2Nvbm5lY3QoYmFja0Zvcndh ZGxpc3QsICJjaGFuZ2VkIiwgR19DQUxMQkFDSyhiYWNrRm9yd2FkbGlzdENoYW5nZWQpLCB3aW5k b3cpOworCiAgICAgZ3RrX2JveF9wYWNrX3N0YXJ0KEdUS19CT1god2luZG93LT5tYWluQm94KSwg R1RLX1dJREdFVCh3aW5kb3ctPndlYlZpZXcpLCBUUlVFLCBUUlVFLCAwKTsKICAgICBndGtfd2lk Z2V0X3Nob3coR1RLX1dJREdFVCh3aW5kb3ctPndlYlZpZXcpKTsKIH0K