35078 2010-02-18 00:34:14 -0800 [Haiku] Implement PopupMenu support. 2010-02-22 23:37:35 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 0 superstippi webkit-unassigned commit-queue simon.maxime oldest_to_newest 191463 0 superstippi 2010-02-18 00:34:14 -0800 The attached patch implements PopupMenu support on Haiku. 191464 1 48981 superstippi 2010-02-18 00:36:36 -0800 Created attachment 48981 Patch implementing PopupMenu support. Patch is against r54932. See ChangeLog for implementation details. Patch does not depend on other patches. 192610 2 48981 eric 2010-02-22 14:03:28 -0800 Comment on attachment 48981 Patch implementing PopupMenu support. This is rather confusing to a non-Be-programmer. Especially "Go()", but it looks non-harmful. rs=me 192798 3 48981 commit-queue 2010-02-22 23:37:31 -0800 Comment on attachment 48981 Patch implementing PopupMenu support. Clearing flags on attachment: 48981 Committed r55122: <http://trac.webkit.org/changeset/55122> 192799 4 commit-queue 2010-02-22 23:37:35 -0800 All reviewed patches have been landed. Closing bug. 48981 2010-02-18 00:36:36 -0800 2010-02-22 23:37:30 -0800 Patch implementing PopupMenu support. popupmenu.diff text/plain 7765 superstippi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NDk0MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDAgQEAKKzIwMTAtMDItMTggIFN0ZXBoYW4gQcOfbXVzICA8c3VwZXJzdGlwcGlA Z214LmRlPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFtIYWlrdV0gSW1wbGVtZW50ZWQgUG9wdXBNZW51IHN1cHBvcnQuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTA3OAorCisgICAgICAgIENvdmVyZWQg YnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgVGhlIGltcGxlbWVudGF0aW9uIGlzIGN1cnJl bnRseSB2ZXJ5IHNpbXBsZTogQWRkZWQgYSBQb3B1cE1lbnVIYWlrdQorICAgICAgICBjbGFzcyB0 aGF0IGRlcml2ZXMgZnJvbSBhIG5hdGl2ZSBCUG9wVXBNZW51LiBJdCBhdHRhY2hlcyBhIEJIYW5k bGVyCisgICAgICAgIGRlcml2YXRpdmUgdG8gdGhlIEJBcHBsaWNhdGlvbiAoV2ViQ29yZSBtYWlu IHRocmVhZCkgd2hpY2ggcmVjZWl2ZXMKKyAgICAgICAgdGhlIGl0ZW0gaW52b2thdGlvbiBhbmQg bWVudSBoaWRkZW4gZXZlbnRzIGFuZCBpbmZvcm1zIHRoZSBQb3B1cE1lbnVDbGllbnQKKyAgICAg ICAgYWNjb3JkaW5nbHkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9Qb3B1cE1lbnUuaDoKKyAgICAg ICAgICAgIENoYW5nZWQgdHlwZSBvZiBtX21lbnUgZm9yIEhhaWt1LgorICAgICAgICAqIHBsYXRm b3JtL2hhaWt1L1BvcHVwTWVudUhhaWt1LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVu dUhhbmRsZXI6OlBvcHVwTWVudUhhbmRsZXIpOgorICAgICAgICAoV2ViQ29yZTo6UG9wdXBNZW51 SGFuZGxlcjo6TWVzc2FnZVJlY2VpdmVkKToKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVudUhh aWt1OjpQb3B1cE1lbnVIYWlrdSk6CisgICAgICAgIChXZWJDb3JlOjpQb3B1cE1lbnVIYWlrdTo6 flBvcHVwTWVudUhhaWt1KToKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVudUhhaWt1OjpzaG93 KToKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVudUhhaWt1OjpoaWRlKToKKyAgICAgICAgKFdl YkNvcmU6OlBvcHVwTWVudUhhaWt1OjpIaWRlKToKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVu dTo6UG9wdXBNZW51KToKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVudTo6flBvcHVwTWVudSk6 CisgICAgICAgICAgICBSZW1vdmVkIGJvZ3VzIGNvZGUuCisgICAgICAgIChXZWJDb3JlOjpQb3B1 cE1lbnU6OnNob3cpOgorICAgICAgICAgICAgSW1wbGVtZW50ZWQgdXNpbmcgbmV3IFBvcHVwTWVu dUhhaWt1IGNsYXNzLgorICAgICAgICAoV2ViQ29yZTo6UG9wdXBNZW51OjpoaWRlKToKKyAgICAg ICAgICAgIEltcGxlbWVudGVkIHVzaW5nIG5ldyBQb3B1cE1lbnVIYWlrdSBjbGFzcy4KKyAgICAg ICAgKFdlYkNvcmU6OlBvcHVwTWVudTo6dXBkYXRlRnJvbUVsZW1lbnQpOgorICAgICAgICAgICAg SW1wbGVtZW50ZWQuCisgICAgICAgIChXZWJDb3JlOjpQb3B1cE1lbnU6Oml0ZW1Xcml0aW5nRGly ZWN0aW9uSXNOYXR1cmFsKToKKyAgICAgICAgICAgIEltcGxlbWVudGVkIGFjY29yZGluZyB0byBH dGsgcG9ydC4KKwogMjAxMC0wMi0xOCAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3Jt L1BvcHVwTWVudS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vUG9wdXBNZW51LmgJ KHJldmlzaW9uIDU0OTMyKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9Qb3B1cE1lbnUuaAkod29ya2lu ZyBjb3B5KQpAQCAtNjEsNyArNjEsOSBAQCBjbGFzcyB3eE1lbnU7CiAjZWxpZiBQTEFURk9STShD SFJPTUlVTSkKICNpbmNsdWRlICJQb3B1cE1lbnVQcml2YXRlLmgiCiAjZWxpZiBQTEFURk9STShI QUlLVSkKLWNsYXNzIEJNZW51OworbmFtZXNwYWNlIFdlYkNvcmUgeworY2xhc3MgUG9wdXBNZW51 SGFpa3U7Cit9CiAjZW5kaWYKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtMTg2LDcgKzE4OCw3 IEBAIHByaXZhdGU6CiAjZWxpZiBQTEFURk9STShDSFJPTUlVTSkKICAgICBQb3B1cE1lbnVQcml2 YXRlIHA7CiAjZWxpZiBQTEFURk9STShIQUlLVSkKLSAgICBCTWVudSogbV9tZW51OworICAgIFBv cHVwTWVudUhhaWt1KiBtX21lbnU7CiAjZW5kaWYKIAogfTsKSW5kZXg6IFdlYkNvcmUvcGxhdGZv cm0vaGFpa3UvUG9wdXBNZW51SGFpa3UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZv cm0vaGFpa3UvUG9wdXBNZW51SGFpa3UuY3BwCShyZXZpc2lvbiA1NDkzMikKKysrIFdlYkNvcmUv cGxhdGZvcm0vaGFpa3UvUG9wdXBNZW51SGFpa3UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xLDcg KzEsNyBAQAogLyoKICAqIFRoaXMgZmlsZSBpcyBwYXJ0IG9mIHRoZSBwb3B1cCBtZW51IGltcGxl bWVudGF0aW9uIGZvciA8c2VsZWN0PiBlbGVtZW50cyBpbiBXZWJDb3JlLgogICoKLSAqIENvcHly aWdodCAoQykgMjAwNyBSeWFuIExlYXZlbmdvb2QgPGxlYXZlbmdvb2RAZ21haWwuY29tPgorICog Q29weXJpZ2h0IChDKSAyMDEwIFN0ZXBoYW4gQcOfbXVzIDxzdXBlcnN0aXBwaUBnbXguZGU+CiAg KgogICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRl IGl0IGFuZC9vcgogICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJh cnkgR2VuZXJhbCBQdWJsaWMKQEAgLTI2LDQyICsyNiwxNjUgQEAKICNpbmNsdWRlICJGcmFtZVZp ZXcuaCIKIAogI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCi0jaW5jbHVkZSA8TWVudS5oPgot CisjaW5jbHVkZSA8QXBwbGljYXRpb24uaD4KKyNpbmNsdWRlIDxIYW5kbGVyLmg+CisjaW5jbHVk ZSA8TWVudUl0ZW0uaD4KKyNpbmNsdWRlIDxNZXNzYWdlLmg+CisjaW5jbHVkZSA8UG9wVXBNZW51 Lmg+CisjaW5jbHVkZSA8U3RyaW5nLmg+CisjaW5jbHVkZSA8V2luZG93Lmg+CisjaW5jbHVkZSA8 c3VwcG9ydC9BdXRvbG9jay5oPgorI2luY2x1ZGUgPHN1cHBvcnQvTG9ja2VyLmg+CiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAorc3RhdGljIGNvbnN0IHVpbnQzMiBrUG9wdXBSZXN1bHQgPSAncG1y cyc7CitzdGF0aWMgY29uc3QgdWludDMyIGtQb3B1cEhpZGRlbiA9ICdwbWhkJzsKKworLy8gVGhp cyBCSGFuZGxlciBpcyBhZGRlZCB0byB0aGUgYXBwbGljYXRpb24gKG1haW4pIHRocmVhZCwgc28g dGhhdCB3ZQorLy8gaW52b2tlIG1ldGhvZHMgb24gdGhlIFBvcHVwTWVudUNsaWVudCB3aXRoaW4g dGhlIG1haW4gdGhyZWFkLgorY2xhc3MgUG9wdXBNZW51SGFuZGxlciA6IHB1YmxpYyBCSGFuZGxl ciB7CitwdWJsaWM6CisgICAgUG9wdXBNZW51SGFuZGxlcihQb3B1cE1lbnVDbGllbnQqIHBvcHVw Q2xpZW50KQorICAgICAgICA6IG1fcG9wdXBDbGllbnQocG9wdXBDbGllbnQpCisgICAgeworICAg IH0KKworICAgIHZpcnR1YWwgdm9pZCBNZXNzYWdlUmVjZWl2ZWQoQk1lc3NhZ2UqIG1lc3NhZ2Up CisgICAgeworICAgICAgICBzd2l0Y2ggKG1lc3NhZ2UtPndoYXQpIHsKKyAgICAgICAgY2FzZSBr UG9wdXBSZXN1bHQ6IHsKKyAgICAgICAgICAgIGludDMyIGluZGV4ID0gMDsKKyAgICAgICAgICAg IG1lc3NhZ2UtPkZpbmRJbnQzMigiaW5kZXgiLCAmaW5kZXgpOworICAgICAgICAgICAgbV9wb3B1 cENsaWVudC0+dmFsdWVDaGFuZ2VkKGluZGV4KTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAg ICB9CisgICAgICAgIGNhc2Uga1BvcHVwSGlkZGVuOgorICAgICAgICAgICAgbV9wb3B1cENsaWVu dC0+cG9wdXBEaWRIaWRlKCk7CisgICAgICAgICAgICBicmVhazsKKworICAgICAgICBkZWZhdWx0 OgorICAgICAgICAgICAgQkhhbmRsZXI6Ok1lc3NhZ2VSZWNlaXZlZChtZXNzYWdlKTsKKyAgICAg ICAgfQorICAgIH0KKworcHJpdmF0ZToKKyAgICBQb3B1cE1lbnVDbGllbnQqIG1fcG9wdXBDbGll bnQ7Cit9OworCitjbGFzcyBQb3B1cE1lbnVIYWlrdSA6IHB1YmxpYyBCUG9wVXBNZW51IHsKK3B1 YmxpYzoKKyAgICBQb3B1cE1lbnVIYWlrdShQb3B1cE1lbnVDbGllbnQqIHBvcHVwQ2xpZW50KQor ICAgICAgICA6IEJQb3BVcE1lbnUoIldlYkNvcmUgUG9wdXAiLCB0cnVlLCBmYWxzZSkKKyAgICAg ICAgLCBtX3BvcHVwQ2xpZW50KHBvcHVwQ2xpZW50KQorICAgICAgICAsIG1fSGFuZGxlcihwb3B1 cENsaWVudCkKKyAgICB7CisgICAgICAgIGlmIChiZV9hcHAtPkxvY2soKSkgeworICAgICAgICAg ICAgYmVfYXBwLT5BZGRIYW5kbGVyKCZtX0hhbmRsZXIpOworICAgICAgICAgICAgYmVfYXBwLT5V bmxvY2soKTsKKyAgICAgICAgfQorICAgICAgICBTZXRBc3luY0F1dG9EZXN0cnVjdChmYWxzZSk7 CisgICAgfQorCisgICAgdmlydHVhbCB+UG9wdXBNZW51SGFpa3UoKQorICAgIHsKKyAgICAgICAg aWYgKGJlX2FwcC0+TG9jaygpKSB7CisgICAgICAgICAgICBiZV9hcHAtPlJlbW92ZUhhbmRsZXIo Jm1fSGFuZGxlcik7CisgICAgICAgICAgICBiZV9hcHAtPlVubG9jaygpOworICAgICAgICB9Cisg ICAgfQorCisgICAgdm9pZCBzaG93KGNvbnN0IEludFJlY3QmIHJlY3QsIEZyYW1lVmlldyogdmll dywgaW50IGluZGV4KQorICAgIHsKKyAgICAgICAgLy8gQ2xlYW4gb3V0IHRoZSBtZW51IGZpcnN0 CisgICAgICAgIGZvciAoaW50MzIgaSA9IENvdW50SXRlbXMoKSAtIDE7IGkgPj0gMDsgaS0tKQor ICAgICAgICAgICAgZGVsZXRlIFJlbW92ZUl0ZW0oaSk7CisKKyAgICAgICAgLy8gUG9wdXBsYXRl IHRoZSBtZW51IGZyb20gdGhlIGNsaWVudAorICAgICAgICBpbnQgaXRlbUNvdW50ID0gbV9wb3B1 cENsaWVudC0+bGlzdFNpemUoKTsKKyAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBpdGVtQ291 bnQ7IGkrKykgeworICAgICAgICAgICAgaWYgKG1fcG9wdXBDbGllbnQtPml0ZW1Jc1NlcGFyYXRv cihpKSkKKyAgICAgICAgICAgICAgICBBZGRTZXBhcmF0b3JJdGVtKCk7CisgICAgICAgICAgICBl bHNlIHsKKyAgICAgICAgICAgICAgICAvLyBOT1RFOiBXZWJDb3JlIGRpc3Rpbmd1aXNoZXMgYmV0 d2VlbiAiR3JvdXAiIGFuZCAiTGFiZWwiCisgICAgICAgICAgICAgICAgLy8gaGVyZSwgYnV0IGJv dGggdHlwZXMgb2YgaXRlbSAocmFkaW8gb3IgY2hlY2sgbWFyaykgY3VycmVudGx5CisgICAgICAg ICAgICAgICAgLy8gbG9vayB0aGUgc2FtZSBvbiBIYWlrdS4KKyAgICAgICAgICAgICAgICBCU3Ry aW5nIGxhYmVsKG1fcG9wdXBDbGllbnQtPml0ZW1UZXh0KGkpKTsKKyAgICAgICAgICAgICAgICBC TWVzc2FnZSogbWVzc2FnZSA9IG5ldyBCTWVzc2FnZShrUG9wdXBSZXN1bHQpOworICAgICAgICAg ICAgICAgIG1lc3NhZ2UtPkFkZEludDMyKCJpbmRleCIsIGkpOworICAgICAgICAgICAgICAgIEJN ZW51SXRlbSogaXRlbSA9IG5ldyBCTWVudUl0ZW0obGFiZWwuU3RyaW5nKCksIG1lc3NhZ2UpOwor ICAgICAgICAgICAgICAgIEFkZEl0ZW0oaXRlbSk7CisgICAgICAgICAgICAgICAgaXRlbS0+U2V0 VGFyZ2V0KEJNZXNzZW5nZXIoJm1fSGFuZGxlcikpOworICAgICAgICAgICAgICAgIGl0ZW0tPlNl dEVuYWJsZWQobV9wb3B1cENsaWVudC0+aXRlbUlzRW5hYmxlZChpKSk7CisgICAgICAgICAgICAg ICAgaXRlbS0+U2V0TWFya2VkKGkgPT0gaW5kZXgpOworICAgICAgICAgICAgfQorICAgICAgICB9 CisKKyAgICAgICAgLy8gV2UgbmVlZCB0byBmb3JjZSBhIGxheW91dCBub3csIG9yIHRoZSBpdGVt IGZyYW1lcyB3aWxsIG5vdCBiZQorICAgICAgICAvLyBjb21wdXRlZCB5ZXQsIHNvIHdlIGNhbm5v dCBtb3ZlIHRoZSBjdXJyZW50IGl0ZW0gdW5kZXIgdGhlIG1vdXNlLgorICAgICAgICBEb0xheW91 dCgpOworCisgICAgICAgIC8vIEFjY291bnQgZm9yIGZyYW1lIG9mIG1lbnUgZmllbGQKKyAgICAg ICAgQlJlY3Qgc2NyZWVuUmVjdCh2aWV3LT5jb250ZW50c1RvU2NyZWVuKHJlY3QpKTsKKyAgICAg ICAgc2NyZWVuUmVjdC5PZmZzZXRCeSgyLCAyKTsKKyAgICAgICAgLy8gTW92ZSBjdXJyZW50bHkg c2VsZWN0ZWQgaXRlbSB1bmRlciB0aGUgbW91c2UuCisgICAgICAgIGlmIChCTWVudUl0ZW0qIGl0 ZW0gPSBJdGVtQXQoaW5kZXgpKQorICAgICAgICAgICAgc2NyZWVuUmVjdC5PZmZzZXRCeSgwLCAt aXRlbS0+RnJhbWUoKS50b3ApOworCisgICAgICAgIEJSZWN0IG9wZW5SZWN0ID0gQm91bmRzKCku T2Zmc2V0VG9TZWxmKHNjcmVlblJlY3QuTGVmdFRvcCgpKTsKKworICAgICAgICBHbyhzY3JlZW5S ZWN0LkxlZnRUb3AoKSwgdHJ1ZSwgdHJ1ZSwgb3BlblJlY3QsIHRydWUpOworICAgIH0KKworICAg IHZvaWQgaGlkZSgpCisgICAgeworICAgICAgICBpZiAoIUlzSGlkZGVuKCkpCisgICAgICAgICAg ICBIaWRlKCk7CisgICAgfQorCitwcml2YXRlOgorICAgIHZpcnR1YWwgdm9pZCBIaWRlKCkKKyAg ICB7CisgICAgICAgIEJQb3BVcE1lbnU6OkhpZGUoKTsKKyAgICAgICAgYmVfYXBwLT5Qb3N0TWVz c2FnZShrUG9wdXBIaWRkZW4sICZtX0hhbmRsZXIpOworICAgIH0KKworICAgIFBvcHVwTWVudUNs aWVudCogbV9wb3B1cENsaWVudDsKKyAgICBQb3B1cE1lbnVIYW5kbGVyIG1fSGFuZGxlcjsKK307 CisKIFBvcHVwTWVudTo6UG9wdXBNZW51KFBvcHVwTWVudUNsaWVudCogY2xpZW50KQogICAgIDog bV9wb3B1cENsaWVudChjbGllbnQpCi0gICAgLCBtX21lbnUoMCkKKyAgICAsIG1fbWVudShuZXcg UG9wdXBNZW51SGFpa3UoY2xpZW50KSkKIHsKKyAgICAvLyBXZSBkb24ndCBuZWVkIGFkZGl0aW9u YWwgcmVmZXJlbmNlcyB0byB0aGUgY2xpZW50LCBzaW5jZSB3ZSBjb21wbGV0ZWx5CisgICAgLy8g Y29udHJvbCBhbnkgc3ViLW9iamVjdHMgd2UgY3JlYXRlIHRoYXQgbmVlZCBpdCBhcyB3ZWxsLgog fQogCiBQb3B1cE1lbnU6On5Qb3B1cE1lbnUoKQogewogICAgIGRlbGV0ZSBtX21lbnU7Ci0gICAg bV9tZW51ID0gMDsKIH0KIAogdm9pZCBQb3B1cE1lbnU6OnNob3coY29uc3QgSW50UmVjdCYgcmVj dCwgRnJhbWVWaWV3KiB2aWV3LCBpbnQgaW5kZXgpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsK KyAgICAvLyBUaGUgbWVudSB3aWxsIHVwZGF0ZSBpdHNlbGYgZnJvbSB0aGUgUG9wdXBNZW51Q2xp ZW50IGJlZm9yZSBzaG93aW5nLgorICAgIG1fbWVudS0+c2hvdyhyZWN0LCB2aWV3LCBpbmRleCk7 CiB9CiAKIHZvaWQgUG9wdXBNZW51OjpoaWRlKCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwor ICAgIG1fbWVudS0+aGlkZSgpOwogfQogCiB2b2lkIFBvcHVwTWVudTo6dXBkYXRlRnJvbUVsZW1l bnQoKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgY2xpZW50KCktPnNldFRleHRGcm9t SXRlbShtX3BvcHVwQ2xpZW50LT5zZWxlY3RlZEluZGV4KCkpOwogfQogCiBib29sIFBvcHVwTWVu dTo6aXRlbVdyaXRpbmdEaXJlY3Rpb25Jc05hdHVyYWwoKQogewotICAgIG5vdEltcGxlbWVudGVk KCk7Ci0gICAgcmV0dXJuIHRydWU7CisgICAgcmV0dXJuIGZhbHNlOwogfQogCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCg==