49376 2010-11-11 04:32:13 -0800 [GTK] Show default context menu for the currently focused element when activated with keyboard 2010-11-16 09:31:52 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 cgarcia webkit-unassigned commit-queue mrobinson oldest_to_newest 307828 0 cgarcia 2010-11-11 04:32:13 -0800 When context menu is activated with keyboard only selections are handled, when nothing is selected the default context menu is shown on top-left corner. If there's a focused element, like a link, the context menu for such element should be used and should be correctly positioned. 307831 1 73599 cgarcia 2010-11-11 04:35:17 -0800 Created attachment 73599 Patch to show context menu for focused items when using the keyboard 307971 2 73599 mrobinson 2010-11-11 09:48:06 -0800 Comment on attachment 73599 Patch to show context menu for focused items when using the keyboard View in context: https://bugs.webkit.org/attachment.cgi?id=73599&action=review > WebKit/gtk/webkit/webkitwebview.cpp:347 > + || (frame->selection()->selection().isCaret() && !frame->selection()->selection().isContentEditable())) { > + // If there's a focused elment, use its location. > + bool locationSet = false; > + Document* doc = frame->document(); > + if (doc) { I think maybe we should break out this block out into a helper function...perhaps everyting from the start of this block to the FIXME. getActiveNodeLocation or something similar? This will simplify things by allowing early returns (you can do away with the locationSet variable). You can also simplify this further by doing something like: if (Document* doc = frame->document()) { if (Node* focusedNode = doc->focusedNode()) { ... } } 308417 3 73707 cgarcia 2010-11-12 00:01:23 -0800 Created attachment 73707 Updated patch I've added a method getFocusedNode() that just returns the currently focused node, because it's more generic and I'll be able to use it for bug #25525 too. 309771 4 73707 commit-queue 2010-11-16 09:31:47 -0800 Comment on attachment 73707 Updated patch Clearing flags on attachment: 73707 Committed r72109: <http://trac.webkit.org/changeset/72109> 309772 5 commit-queue 2010-11-16 09:31:52 -0800 All reviewed patches have been landed. Closing bug. 73599 2010-11-11 04:35:17 -0800 2010-11-12 00:01:23 -0800 Patch to show context menu for focused items when using the keyboard default-context-menu-keyboard.diff text/plain 2113 cgarcia ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggNmQ5YTY1Mi4uM2Y2YjA5YSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0xMS0xMSAg Q2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gU2hvdyBkZWZhdWx0IGNv bnRleHQgbWVudSBmb3IgdGhlIGN1cnJlbnRseSBmb2N1c2VkIGVsZW1lbnQgd2hlbiBhY3RpdmF0 ZWQgd2l0aCBrZXlib2FyZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDkzNzYKKworICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcDoKKyAg ICAgICAgKHdlYmtpdF93ZWJfdmlld19wb3B1cF9tZW51X2hhbmRsZXIpOgorCiAyMDEwLTExLTA4 ICBOaWNvbGFzIER1ZnJlc25lICA8bmljb2xhcy5kdWZyZXNuZUBjb2xsYWJvcmEuY28udWs+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29uLgpkaWZmIC0tZ2l0IGEvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3 ZWJ2aWV3LmNwcAppbmRleCA2NTMxZWUxLi5jYjk4YjI0IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3Rr L3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3 ZWJ2aWV3LmNwcApAQCAtMzQwLDkgKzM0MCwyMSBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dl Yl92aWV3X3BvcHVwX21lbnVfaGFuZGxlcihHdGtXaWRnZXQqIHdpZGdldCkKICAgICBJbnRQb2lu dCBsb2NhdGlvbjsKIAogICAgIGlmICghc3RhcnQubm9kZSgpIHx8ICFlbmQubm9kZSgpCi0gICAg ICAgIHx8IChmcmFtZS0+c2VsZWN0aW9uKCktPnNlbGVjdGlvbigpLmlzQ2FyZXQoKSAmJiAhZnJh bWUtPnNlbGVjdGlvbigpLT5zZWxlY3Rpb24oKS5pc0NvbnRlbnRFZGl0YWJsZSgpKSkKLSAgICAg ICAgbG9jYXRpb24gPSBJbnRQb2ludChyaWdodEFsaWduZWQgPyB2aWV3LT5jb250ZW50c1dpZHRo KCkgLSBjb250ZXh0TWVudU1hcmdpbiA6IGNvbnRleHRNZW51TWFyZ2luLCBjb250ZXh0TWVudU1h cmdpbik7Ci0gICAgZWxzZSB7CisgICAgICAgIHx8IChmcmFtZS0+c2VsZWN0aW9uKCktPnNlbGVj dGlvbigpLmlzQ2FyZXQoKSAmJiAhZnJhbWUtPnNlbGVjdGlvbigpLT5zZWxlY3Rpb24oKS5pc0Nv bnRlbnRFZGl0YWJsZSgpKSkgeworICAgICAgICAvLyBJZiB0aGVyZSdzIGEgZm9jdXNlZCBlbG1l bnQsIHVzZSBpdHMgbG9jYXRpb24uCisgICAgICAgIGJvb2wgbG9jYXRpb25TZXQgPSBmYWxzZTsK KyAgICAgICAgRG9jdW1lbnQqIGRvYyA9IGZyYW1lLT5kb2N1bWVudCgpOworICAgICAgICBpZiAo ZG9jKSB7CisgICAgICAgICAgICBOb2RlKiBmb2N1c2VkTm9kZSA9IGRvYy0+Zm9jdXNlZE5vZGUo KTsKKyAgICAgICAgICAgIGlmIChmb2N1c2VkTm9kZSkgeworICAgICAgICAgICAgICAgIEludFJl Y3QgZm9jdXNlZE5vZGVSZWN0ID0gZm9jdXNlZE5vZGUtPmdldFJlY3QoKTsKKyAgICAgICAgICAg ICAgICBsb2NhdGlvbiA9IEludFBvaW50KHJpZ2h0QWxpZ25lZCA/IGZvY3VzZWROb2RlUmVjdC5y aWdodCgpIDogZm9jdXNlZE5vZGVSZWN0LngoKSwgZm9jdXNlZE5vZGVSZWN0LmJvdHRvbSgpKTsK KyAgICAgICAgICAgICAgICBsb2NhdGlvblNldCA9IHRydWU7CisgICAgICAgICAgICB9CisgICAg ICAgIH0KKyAgICAgICAgaWYgKCFsb2NhdGlvblNldCkKKyAgICAgICAgICAgIGxvY2F0aW9uID0g SW50UG9pbnQocmlnaHRBbGlnbmVkID8gdmlldy0+Y29udGVudHNXaWR0aCgpIC0gY29udGV4dE1l bnVNYXJnaW4gOiBjb250ZXh0TWVudU1hcmdpbiwgY29udGV4dE1lbnVNYXJnaW4pOworICAgIH0g ZWxzZSB7CiAgICAgICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSBzdGFydC5ub2RlKCktPnJl bmRlcmVyKCk7CiAgICAgICAgIGlmICghcmVuZGVyZXIpCiAgICAgICAgICAgICByZXR1cm4gRkFM U0U7Cg== 73707 2010-11-12 00:01:23 -0800 2010-11-16 09:31:47 -0800 Updated patch context-menu-keyboard2.diff text/plain 2333 cgarcia ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggNmQ5YTY1Mi4uM2Y2YjA5YSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0xMS0xMSAg Q2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gU2hvdyBkZWZhdWx0IGNv bnRleHQgbWVudSBmb3IgdGhlIGN1cnJlbnRseSBmb2N1c2VkIGVsZW1lbnQgd2hlbiBhY3RpdmF0 ZWQgd2l0aCBrZXlib2FyZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDkzNzYKKworICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcDoKKyAg ICAgICAgKHdlYmtpdF93ZWJfdmlld19wb3B1cF9tZW51X2hhbmRsZXIpOgorCiAyMDEwLTExLTA4 ICBOaWNvbGFzIER1ZnJlc25lICA8bmljb2xhcy5kdWZyZXNuZUBjb2xsYWJvcmEuY28udWs+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29uLgpkaWZmIC0tZ2l0IGEvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3 ZWJ2aWV3LmNwcAppbmRleCA2NTMxZWUxLi45YmRkNGI3IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3Rr L3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3 ZWJ2aWV3LmNwcApAQCAtMjQ1LDYgKzI0NSwxMyBAQCBzdGF0aWMgdm9pZCBQb3B1cE1lbnVQb3Np dGlvbkZ1bmMoR3RrTWVudSogbWVudSwgZ2ludCAqeCwgZ2ludCAqeSwgZ2Jvb2xlYW4gKnB1cwog ICAgICpwdXNoSW4gPSBGQUxTRTsKIH0KIAorc3RhdGljIE5vZGUqIGdldEZvY3VzZWROb2RlKEZy YW1lKiBmcmFtZSkKK3sKKyAgICBpZiAoRG9jdW1lbnQqIGRvYyA9IGZyYW1lLT5kb2N1bWVudCgp KQorICAgICAgICByZXR1cm4gZG9jLT5mb2N1c2VkTm9kZSgpOworICAgIHJldHVybiAwOworfQor CiBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X2ZvcndhcmRfY29udGV4dF9tZW51X2V2 ZW50KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYgZXZl bnQpCiB7CiAgICAgUGFnZSogcGFnZSA9IGNvcmUod2ViVmlldyk7CkBAIC0zNDAsOSArMzQ3LDE0 IEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfcG9wdXBfbWVudV9oYW5kbGVyKEd0 a1dpZGdldCogd2lkZ2V0KQogICAgIEludFBvaW50IGxvY2F0aW9uOwogCiAgICAgaWYgKCFzdGFy dC5ub2RlKCkgfHwgIWVuZC5ub2RlKCkKLSAgICAgICAgfHwgKGZyYW1lLT5zZWxlY3Rpb24oKS0+ c2VsZWN0aW9uKCkuaXNDYXJldCgpICYmICFmcmFtZS0+c2VsZWN0aW9uKCktPnNlbGVjdGlvbigp LmlzQ29udGVudEVkaXRhYmxlKCkpKQotICAgICAgICBsb2NhdGlvbiA9IEludFBvaW50KHJpZ2h0 QWxpZ25lZCA/IHZpZXctPmNvbnRlbnRzV2lkdGgoKSAtIGNvbnRleHRNZW51TWFyZ2luIDogY29u dGV4dE1lbnVNYXJnaW4sIGNvbnRleHRNZW51TWFyZ2luKTsKLSAgICBlbHNlIHsKKyAgICAgICAg fHwgKGZyYW1lLT5zZWxlY3Rpb24oKS0+c2VsZWN0aW9uKCkuaXNDYXJldCgpICYmICFmcmFtZS0+ c2VsZWN0aW9uKCktPnNlbGVjdGlvbigpLmlzQ29udGVudEVkaXRhYmxlKCkpKSB7CisgICAgICAg IC8vIElmIHRoZXJlJ3MgYSBmb2N1c2VkIGVsbWVudCwgdXNlIGl0cyBsb2NhdGlvbi4KKyAgICAg ICAgaWYgKE5vZGUqIGZvY3VzZWROb2RlID0gZ2V0Rm9jdXNlZE5vZGUoZnJhbWUpKSB7CisgICAg ICAgICAgICBJbnRSZWN0IGZvY3VzZWROb2RlUmVjdCA9IGZvY3VzZWROb2RlLT5nZXRSZWN0KCk7 CisgICAgICAgICAgICBsb2NhdGlvbiA9IEludFBvaW50KHJpZ2h0QWxpZ25lZCA/IGZvY3VzZWRO b2RlUmVjdC5yaWdodCgpIDogZm9jdXNlZE5vZGVSZWN0LngoKSwgZm9jdXNlZE5vZGVSZWN0LmJv dHRvbSgpKTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBsb2NhdGlvbiA9IEludFBvaW50 KHJpZ2h0QWxpZ25lZCA/IHZpZXctPmNvbnRlbnRzV2lkdGgoKSAtIGNvbnRleHRNZW51TWFyZ2lu IDogY29udGV4dE1lbnVNYXJnaW4sIGNvbnRleHRNZW51TWFyZ2luKTsKKyAgICB9IGVsc2Ugewog ICAgICAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVyID0gc3RhcnQubm9kZSgpLT5yZW5kZXJlcigp OwogICAgICAgICBpZiAoIXJlbmRlcmVyKQogICAgICAgICAgICAgcmV0dXJuIEZBTFNFOwo=