148461 2015-08-25 20:35:20 -0700 [Win] Simplify menu handling code in WinLauncher 2015-08-26 10:34:09 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build PC All RESOLVED FIXED P2 Normal --- 148451 1 bfulgham bfulgham bfulgham commit-queue sabouhallawa oldest_to_newest 1120822 0 bfulgham 2015-08-25 20:35:20 -0700 Said pointed out in a recent code review that the menu handler for WinLauncher duplicates a bunch of menu item checks with the main WinProc. This patch attempts to follow-up on that suggestion. 1120825 1 259917 bfulgham 2015-08-25 20:46:56 -0700 Created attachment 259917 Patch 1120964 2 sabouhallawa 2015-08-26 09:46:50 -0700 Looks good to me. Unofficial r=me. Thanks for cleaning this part of the code. 1120973 3 259917 commit-queue 2015-08-26 10:34:06 -0700 Comment on attachment 259917 Patch Clearing flags on attachment: 259917 Committed r188969: <http://trac.webkit.org/changeset/188969> 1120974 4 commit-queue 2015-08-26 10:34:09 -0700 All reviewed patches have been landed. Closing bug. 259917 2015-08-25 20:46:56 -0700 2015-08-26 10:34:06 -0700 Patch bug-148461-20150825210153.patch text/plain 3717 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE4ODk0MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE1LTA4LTI1ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5dIFNpbXBsaWZ5IG1lbnUgaGFuZGxpbmcgY29kZSBpbiBXaW5MYXVu Y2hlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4 NDYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV2 aXNlICdUb2dnbGVNZW51SXRlbScgdG8gcmV0dXJuIGEgYm9vbGVhbiB2YWx1ZSBpbmRpY2F0aW5n IGlmCisgICAgICAgIGl0IGhhbmRsZWQgdGhlIG1lc3NhZ2UuIFJldmlzZSBXbmRQcm9jIHRvIHVz ZSB0aGlzIHRvIGRlY2lkZSBpZiBpdAorICAgICAgICBzaG91bGQgcGFzcyB0aGUgbWVzc2FnZSBv biB0byB0aGUgZGVmYXVsdCBoYW5kbGVyLCByYXRoZXIgdGhhbgorICAgICAgICBkdXBsaWNhdGlu ZyB0aGUgbG9naWMgaW4gYm90aCBwbGFjZXMuCisgICAgICAgIAorICAgICAgICAqIFdpbkxhdW5j aGVyL0NvbW1vbi5jcHA6CisgICAgICAgIChUb2dnbGVNZW51SXRlbSk6IFJldHVybiB0cnVlIGlm IHRoZSBtZW51IGl0ZW0gbWVzc2FnZSB3YXMgaGFuZGxlZC4KKyAgICAgICAgKFduZFByb2MpOiBJ ZiAnVG9nZ2xlTWVudUl0ZW0nIGRpZCBub3QgaGFuZGxlIHRoZSBtZXNzYWdlLCBwYXNzCisgICAg ICAgIHRoZSBtZXNzYWdlIHRvdGhlIGRlZmF1bHQgaGFuZGxlci4KKwogMjAxNS0wOC0yNSAgQW5k eSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gcnVuLXdlYmtpdC10 ZXN0cyBmYWlscyBpZiB3YXRjaE9TIFNESyBpcyBpbnN0YWxsZWQKSW5kZXg6IFRvb2xzL1dpbkxh dW5jaGVyL0NvbW1vbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvV2luTGF1bmNoZXIvQ29tbW9u LmNwcAkocmV2aXNpb24gMTg4OTM5KQorKysgVG9vbHMvV2luTGF1bmNoZXIvQ29tbW9uLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMzU5LDggKzM1OSwxMSBAQCBzdGF0aWMgdm9pZCB0dXJuT2ZmT3Ro ZXJVc2VyQWdlbnRzKEhNRU5VCiAgICAgfQogfQogCi1zdGF0aWMgdm9pZCBUb2dnbGVNZW51SXRl bShIV05EIGhXbmQsIFVJTlQgbWVudUlEKQorc3RhdGljIGJvb2wgVG9nZ2xlTWVudUl0ZW0oSFdO RCBoV25kLCBVSU5UIG1lbnVJRCkKIHsKKyAgICBpZiAoIWdXaW5MYXVuY2hlcikKKyAgICAgICAg cmV0dXJuIGZhbHNlOworCiAgICAgSE1FTlUgbWVudSA9IDo6R2V0TWVudShoV25kKTsKIAogICAg IE1FTlVJVEVNSU5GTyBpbmZvOwpAQCAtMzY5LDEyICszNzIsMTIgQEAgc3RhdGljIHZvaWQgVG9n Z2xlTWVudUl0ZW0oSFdORCBoV25kLCBVSQogICAgIGluZm8uZk1hc2sgPSBNSUlNX1NUQVRFOwog CiAgICAgaWYgKCE6OkdldE1lbnVJdGVtSW5mbyhtZW51LCBtZW51SUQsIEZBTFNFLCAmaW5mbykp Ci0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgQk9PTCBuZXdT dGF0ZSA9ICFtZW51SXRlbUlzQ2hlY2tlZChpbmZvKTsKIAogICAgIGlmICghZ1dpbkxhdW5jaGVy LT5zdGFuZGFyZFByZWZlcmVuY2VzKCkgfHwgIWdXaW5MYXVuY2hlci0+cHJpdmF0ZVByZWZlcmVu Y2VzKCkpCi0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgc3dp dGNoIChtZW51SUQpIHsKICAgICBjYXNlIElETV9BVkZPVU5EQVRJT046CkBAIC00MjIsMTEgKzQy NSwxNSBAQCBzdGF0aWMgdm9pZCBUb2dnbGVNZW51SXRlbShIV05EIGhXbmQsIFVJCiAgICAgICAg IC8vIFRoZSBhY3R1YWwgdXNlciBhZ2VudCBzdHJpbmcgd2lsbCBiZSBzZXQgYnkgdGhlIGN1c3Rv bSB1c2VyIGFnZW50IGRpYWxvZwogICAgICAgICB0dXJuT2ZmT3RoZXJVc2VyQWdlbnRzKG1lbnUp OwogICAgICAgICBicmVhazsKKyAgICBkZWZhdWx0OgorICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgfQogCiAgICAgaW5mby5mU3RhdGUgPSAobmV3U3RhdGUpID8gTUZTX0NIRUNLRUQgOiBNRlNf VU5DSEVDS0VEOwogCiAgICAgOjpTZXRNZW51SXRlbUluZm8obWVudSwgbWVudUlELCBGQUxTRSwg JmluZm8pOworCisgICAgcmV0dXJuIHRydWU7CiB9CiAKIHN0YXRpYyBjb25zdCBpbnQgZHJhZ0Jh ckhlaWdodCA9IDMwOwpAQCAtNDg3LDI2ICs0OTQsNiBAQCBMUkVTVUxUIENBTExCQUNLIFduZFBy b2MoSFdORCBoV25kLCBVSU5UCiAgICAgICAgICAgICBpZiAoZ1dpbkxhdW5jaGVyKQogICAgICAg ICAgICAgICAgIGdXaW5MYXVuY2hlci0+bmF2aWdhdGVGb3J3YXJkT3JCYWNrd2FyZChoV25kLCB3 bUlkKTsKICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIElETV9BVkZPVU5EQVRJT046 Ci0gICAgICAgIGNhc2UgSURNX0FDQ19DT01QT1NJVElORzoKLSAgICAgICAgY2FzZSBJRE1fV0tf RlVMTFNDUkVFTjoKLSAgICAgICAgY2FzZSBJRE1fQ09NUE9TSVRJTkdfQk9SREVSUzoKLSAgICAg ICAgY2FzZSBJRE1fSU5WRVJUX0NPTE9SUzoKLSAgICAgICAgY2FzZSBJRE1fRElTQUJMRV9JTUFH RVM6Ci0gICAgICAgIGNhc2UgSURNX0RJU0FCTEVfU1RZTEVTOgotICAgICAgICBjYXNlIElETV9E SVNBQkxFX0pBVkFTQ1JJUFQ6Ci0gICAgICAgIGNhc2UgSURNX0RJU0FCTEVfTE9DQUxfRklMRV9S RVNUUklDVElPTlM6Ci0gICAgICAgIGNhc2UgSURNX1VBX0RFRkFVTFQ6Ci0gICAgICAgIGNhc2Ug SURNX1VBX1NBRkFSSV84XzA6Ci0gICAgICAgIGNhc2UgSURNX1VBX1NBRkFSSV9JT1NfOF9JUEhP TkU6Ci0gICAgICAgIGNhc2UgSURNX1VBX1NBRkFSSV9JT1NfOF9JUEFEOgotICAgICAgICBjYXNl IElETV9VQV9JRV8xMToKLSAgICAgICAgY2FzZSBJRE1fVUFfQ0hST01FX01BQzoKLSAgICAgICAg Y2FzZSBJRE1fVUFfQ0hST01FX1dJTjoKLSAgICAgICAgY2FzZSBJRE1fVUFfRklSRUZPWF9NQUM6 Ci0gICAgICAgIGNhc2UgSURNX1VBX0ZJUkVGT1hfV0lOOgotICAgICAgICAgICAgVG9nZ2xlTWVu dUl0ZW0oaFduZCwgd21JZCk7Ci0gICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBJRE1f VUFfT1RIRVI6CiAgICAgICAgICAgICBpZiAod21FdmVudCkKICAgICAgICAgICAgICAgICBUb2dn bGVNZW51SXRlbShoV25kLCB3bUlkKTsKQEAgLTUyNiw3ICs1MTMsOCBAQCBMUkVTVUxUIENBTExC QUNLIFduZFByb2MoSFdORCBoV25kLCBVSU5UCiAgICAgICAgICAgICAgICAgZ1dpbkxhdW5jaGVy LT56b29tT3V0KCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgZGVmYXVsdDoKLSAgICAg ICAgICAgIHJldHVybiBDYWxsV2luZG93UHJvYyhwYXJlbnRQcm9jLCBoV25kLCBtZXNzYWdlLCB3 UGFyYW0sIGxQYXJhbSk7CisgICAgICAgICAgICBpZiAoIVRvZ2dsZU1lbnVJdGVtKGhXbmQsIHdt SWQpKQorICAgICAgICAgICAgICAgIHJldHVybiBDYWxsV2luZG93UHJvYyhwYXJlbnRQcm9jLCBo V25kLCBtZXNzYWdlLCB3UGFyYW0sIGxQYXJhbSk7CiAgICAgICAgIH0KICAgICAgICAgfQogICAg ICAgICBicmVhazsK