122774 2013-10-14 12:52:21 -0700 Windows popup menu does not reselect last selected index when clicking on a disabled option 2013-11-02 11:05:14 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) PC Windows 7 RESOLVED FIXED InRadar P2 Normal --- 1 roger_fong webkit-unassigned bfulgham jonlee krudtaa roger_fong oldest_to_newest 939605 0 roger_fong 2013-10-14 12:52:21 -0700 <rdar://problem/6138855> Right now we set the selected item to the last focused element (which is the last element the user focused on via either mouse or keyboard interaction). It should just go to the previously selected item if we click on a disabled option (this is to match behavior on mac) 939607 1 214183 roger_fong 2013-10-14 13:04:43 -0700 Created attachment 214183 patch 939615 2 214183 bfulgham 2013-10-14 13:24:58 -0700 Comment on attachment 214183 patch View in context: https://bugs.webkit.org/attachment.cgi?id=214183&action=review Looks good to me. I wonder if we will mess up WINCE at all with the movement of the "setFocusedIndex" logic to inside the #if !OS(WINCE) block. > Source/WebCore/platform/win/PopupMenuWin.cpp:167 > + } Do you think this block is needed by WINCE? 939634 3 roger_fong 2013-10-14 14:15:52 -0700 Oops. Didn't notice that I had put that there. I'll move it out though just to be safe. 939679 4 roger_fong 2013-10-14 15:52:44 -0700 Committed: http://trac.webkit.org/changeset/157423 946251 5 mitz 2013-11-02 11:05:14 -0700 *** Bug 18358 has been marked as a duplicate of this bug. *** 214183 2013-10-14 13:04:43 -0700 2013-10-14 13:24:58 -0700 patch firstpatch.patch text/plain 3879 roger_fong SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzQxNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEzLTEwLTE0ICBSb2dlciBG b25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMjc3NC4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYx Mzg4NTU+LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZCBhIGZpZWxkIHRvIGtlZXAgdHJhY2sgb2YgaG92ZXJlZCBvdmVyIGluZGV4LgorICAgICAg ICBVc2UgaW5kZXggdG8gZGV0ZXJtaW5lIHdoZXRoZXIgb3Igbm90IHRvIHVzZSB0aGUgZXhpc3Rp bmcgc2VsZWN0ZWQgaW5kZXggb24gdGhlIG1vdXNlIGRvd24gZXZlbnQuCisKKyAgICAgICAgKiBw bGF0Zm9ybS93aW4vUG9wdXBNZW51V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVu dVdpbjo6UG9wdXBNZW51V2luKToKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVudVdpbjo6c2hv dyk6CisgICAgICAgIChXZWJDb3JlOjpQb3B1cE1lbnVXaW46OnduZFByb2MpOgorICAgICAgICAq IHBsYXRmb3JtL3dpbi9Qb3B1cE1lbnVXaW4uaDoKKwogMjAxMy0xMC0xNCAgSGFucyBNdWxsZXIg IDxobXVsbGVyQGFkb2JlLmNvbT4KIAogICAgICAgICBbQ1NTIFNoYXBlc10gSW1hZ2UgdmFsdWVk IHNoYXBlLW91dHNpZGUgc2hhcGVzIHNob3VsZCB1cGRhdGUgdGhlIGxheW91dCBhZnRlciB0aGUg aW1hZ2UgaGFzIGJlZW4gbG9hZGVkCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4v UG9wdXBNZW51V2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93 aW4vUG9wdXBNZW51V2luLmNwcAkocmV2aXNpb24gMTU3NDE0KQorKysgU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vd2luL1BvcHVwTWVudVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMiw2ICsx MTIsNyBAQAogICAgICwgbV9zY3JvbGxPZmZzZXQoMCkKICAgICAsIG1fd2hlZWxEZWx0YSgwKQog ICAgICwgbV9mb2N1c2VkSW5kZXgoMCkKKyAgICAsIG1faG92ZXJlZEluZGV4KDApCiAgICAgLCBt X3Njcm9sbGJhckNhcHR1cmluZ01vdXNlKGZhbHNlKQogICAgICwgbV9zaG93UG9wdXAoZmFsc2Up CiB7CkBAIC0xNTksNiArMTYwLDEyIEBACiAjaWYgIU9TKFdJTkNFKQogICAgIDo6U3lzdGVtUGFy YW1ldGVyc0luZm8oU1BJX0dFVENPTUJPQk9YQU5JTUFUSU9OLCAwLCAmc2hvdWxkQW5pbWF0ZSwg MCk7CiAKKyAgICBpZiAoY2xpZW50KCkpIHsKKyAgICAgICAgaW50IGluZGV4ID0gY2xpZW50KCkt PnNlbGVjdGVkSW5kZXgoKTsKKyAgICAgICAgaWYgKGluZGV4ID49IDApCisgICAgICAgICAgICBz ZXRGb2N1c2VkSW5kZXgoaW5kZXgpOworICAgIH0KKwogICAgIGlmIChzaG91bGRBbmltYXRlKSB7 CiAgICAgICAgIFJFQ1Qgdmlld1JlY3QgPSB7MH07CiAgICAgICAgIDo6R2V0V2luZG93UmVjdCho b3N0V2luZG93LCAmdmlld1JlY3QpOwpAQCAtMTY2LDEzICsxNzMsOCBAQAogICAgICAgICAgICAg OjpBbmltYXRlV2luZG93KG1fcG9wdXAsIGRlZmF1bHRBbmltYXRpb25EdXJhdGlvbiwgQVdfQkxF TkQpOwogICAgIH0gZWxzZQogI2VuZGlmCi0gICAgICAgIDo6U2hvd1dpbmRvdyhtX3BvcHVwLCBT V19TSE9XTk9BQ1RJVkFURSk7CiAKLSAgICBpZiAoY2xpZW50KCkpIHsKLSAgICAgICAgaW50IGlu ZGV4ID0gY2xpZW50KCktPnNlbGVjdGVkSW5kZXgoKTsKLSAgICAgICAgaWYgKGluZGV4ID49IDAp Ci0gICAgICAgICAgICBzZXRGb2N1c2VkSW5kZXgoaW5kZXgpOwotICAgIH0KKyAgICA6OlNob3dX aW5kb3cobV9wb3B1cCwgU1dfU0hPV05PQUNUSVZBVEUpOwogCiAgICAgbV9zaG93UG9wdXAgPSB0 cnVlOwogCkBAIC05NzksOCArOTgxLDEwIEBACiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgICAgICB9CiAKLSAgICAgICAgICAgIGlmICgoc2hvdWxkSG90VHJhY2sgfHwgd1BhcmFtICYg TUtfTEJVVFRPTikgJiYgOjpQdEluUmVjdCgmYm91bmRzLCBtb3VzZVBvaW50KSkKKyAgICAgICAg ICAgIGlmICgoc2hvdWxkSG90VHJhY2sgfHwgd1BhcmFtICYgTUtfTEJVVFRPTikgJiYgOjpQdElu UmVjdCgmYm91bmRzLCBtb3VzZVBvaW50KSkgewogICAgICAgICAgICAgICAgIHNldEZvY3VzZWRJ bmRleChsaXN0SW5kZXhBdFBvaW50KG1vdXNlUG9pbnQpLCB0cnVlKTsKKyAgICAgICAgICAgICAg ICBtX2hvdmVyZWRJbmRleCA9IGxpc3RJbmRleEF0UG9pbnQobW91c2VQb2ludCk7CisgICAgICAg ICAgICB9CiAKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CkBAIC0xMDAyLDggKzEwMDYs MTAgQEAKICAgICAgICAgICAgIC8vIGhpZGUgdGhlIHBvcHVwLgogICAgICAgICAgICAgUkVDVCBi b3VuZHM7CiAgICAgICAgICAgICBHZXRDbGllbnRSZWN0KG1fcG9wdXAsICZib3VuZHMpOwotICAg ICAgICAgICAgaWYgKDo6UHRJblJlY3QoJmJvdW5kcywgbW91c2VQb2ludCkpCisgICAgICAgICAg ICBpZiAoOjpQdEluUmVjdCgmYm91bmRzLCBtb3VzZVBvaW50KSkgewogICAgICAgICAgICAgICAg IHNldEZvY3VzZWRJbmRleChsaXN0SW5kZXhBdFBvaW50KG1vdXNlUG9pbnQpLCB0cnVlKTsKKyAg ICAgICAgICAgICAgICBtX2hvdmVyZWRJbmRleCA9IGxpc3RJbmRleEF0UG9pbnQobW91c2VQb2lu dCk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgaGlk ZSgpOwogICAgICAgICAgICAgYnJlYWs7CkBAIC0xMDI5LDcgKzEwMzUsOSBAQAogICAgICAgICAg ICAgR2V0Q2xpZW50UmVjdChwb3B1cEhhbmRsZSgpLCAmYm91bmRzKTsKICAgICAgICAgICAgIGlm IChjbGllbnQoKSAmJiA6OlB0SW5SZWN0KCZib3VuZHMsIG1vdXNlUG9pbnQpKSB7CiAgICAgICAg ICAgICAgICAgaGlkZSgpOwotICAgICAgICAgICAgICAgIGludCBpbmRleCA9IGZvY3VzZWRJbmRl eCgpOworICAgICAgICAgICAgICAgIGludCBpbmRleCA9IG1faG92ZXJlZEluZGV4OworICAgICAg ICAgICAgICAgIGlmICghY2xpZW50KCktPml0ZW1Jc0VuYWJsZWQoaW5kZXgpKQorICAgICAgICAg ICAgICAgICAgICBpbmRleCA9IGNsaWVudCgpLT5zZWxlY3RlZEluZGV4KCk7CiAgICAgICAgICAg ICAgICAgaWYgKGluZGV4ID49IDApCiAgICAgICAgICAgICAgICAgICAgIGNsaWVudCgpLT52YWx1 ZUNoYW5nZWQoaW5kZXgpOwogICAgICAgICAgICAgfQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vd2luL1BvcHVwTWVudVdpbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL3dpbi9Qb3B1cE1lbnVXaW4uaAkocmV2aXNpb24gMTU3NDE0KQorKysgU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vd2luL1BvcHVwTWVudVdpbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjgs NiArMTI4LDcgQEAKICAgICBpbnQgbV9zY3JvbGxPZmZzZXQ7CiAgICAgaW50IG1fd2hlZWxEZWx0 YTsKICAgICBpbnQgbV9mb2N1c2VkSW5kZXg7CisgICAgaW50IG1faG92ZXJlZEluZGV4OwogICAg IGJvb2wgbV9zY3JvbGxiYXJDYXB0dXJpbmdNb3VzZTsKICAgICBib29sIG1fc2hvd1BvcHVwOwog fTsK