48816 2010-11-01 18:31:13 -0700 [GTK] PopupMenuGtk has a very confusing if-else block 2010-11-01 21:34:47 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 mrobinson webkit-unassigned dbates oldest_to_newest 303142 0 mrobinson 2010-11-01 18:31:13 -0700 There is some very confusing code in PopupMenuGtk. This bug tracks cleaning it up. 303143 1 72615 mrobinson 2010-11-01 18:34:17 -0700 Created attachment 72615 Code cleanup 303144 2 72615 dbates 2010-11-01 18:35:32 -0700 Comment on attachment 72615 Code cleanup Looks good to me. Yay! for the cleanup. r=me 303151 3 72615 mrobinson 2010-11-01 18:46:14 -0700 Comment on attachment 72615 Code cleanup Removing this from the commit-queue since dbates warned me that it could land uncleanly. 303206 4 mrobinson 2010-11-01 21:34:47 -0700 Committed r71099: <http://trac.webkit.org/changeset/71099> 72615 2010-11-01 18:34:17 -0700 2010-11-01 18:46:14 -0700 Code cleanup bug-48816-20101101183412.patch text/plain 2070 mrobinson ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OTc4MDk1ZTZjY2FkNWE1YTk5M2U5YjlmODgyMDNjMmE5ZDA1NmFiZC4uMjU4OGU2MDk2YzFiMWRi M2MzNTU2MmNjMDY4ZjE4MWVjNjlmZWU4OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNyBAQAogMjAxMC0xMS0wMSAgTWFy dGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gUG9wdXBNZW51R3RrIGhhcyBhIHZl cnkgY29uZnVzaW5nIGlmLWVsc2UgYmxvY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQ4ODE2CisKKyAgICAgICAgU21hbGwgY29kZSBjbGVhbnVwIGZv ciBQb3B1cE1lbnVHdGsuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvUG9wdXBNZW51R3RrLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVudUd0azo6c2hvdyk6CisKKzIwMTAtMTEtMDEg IE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCiAgICAgICAgIFJldmll d2VkIGJ5IFhhbiBMb3Blei4KIAogICAgICAgICBbU291cF0gUmFuZG9tIGNyYXNoZXMgaW4gaHR0 cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvd29ya2Vycy93b3JrZXItaGFuZHNoYWtlLWNoYWxsZW5n ZS1yYW5kb21uZXNzLmh0bWwKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1BvcHVw TWVudUd0ay5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9Qb3B1cE1lbnVHdGsuY3BwCmluZGV4 IGE2Nzk3MzRlNmY2ZTM4Yjk4ZjBlNmYzNmM1MjJiNTc4MzU4NjhjMDYuLmU3ZmY3OGUwYzk1N2Uy YTAzZDhjNTk0Yjk3ZDJmMDk2ZjY3OWUwNDcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0v Z3RrL1BvcHVwTWVudUd0ay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUG9wdXBNZW51 R3RrLmNwcApAQCAtOTcsNyArOTcsNyBAQCB2b2lkIFBvcHVwTWVudUd0azo6c2hvdyhjb25zdCBJ bnRSZWN0JiByZWN0LCBGcmFtZVZpZXcqIHZpZXcsIGludCBpbmRleCkKIAogICAgIEdMaXN0KiBj aGlsZHJlbiA9IGd0a19jb250YWluZXJfZ2V0X2NoaWxkcmVuKEdUS19DT05UQUlORVIobV9wb3B1 cC5nZXQoKSkpOwogICAgIEdMaXN0KiBwID0gY2hpbGRyZW47Ci0gICAgaWYgKHNpemUpCisgICAg aWYgKHNpemUpIHsKICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBzaXplOyBpKyspIHsKICAg ICAgICAgICAgIGlmIChpID4gaW5kZXgpCiAgICAgICAgICAgICAgIGJyZWFrOwpAQCAtMTEyLDkg KzExMiwxMSBAQCB2b2lkIFBvcHVwTWVudUd0azo6c2hvdyhjb25zdCBJbnRSZWN0JiByZWN0LCBG cmFtZVZpZXcqIHZpZXcsIGludCBpbmRleCkKICAgICAgICAgICAgIG1fbWVudVBvc2l0aW9uLnNl dFkobV9tZW51UG9zaXRpb24ueSgpIC0gaXRlbVJlcXVpc2l0aW9uLmhlaWdodCk7CiAKICAgICAg ICAgICAgIHAgPSBnX2xpc3RfbmV4dChwKTsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAv LyBDZW50ZXIgdmVydGljYWxseSB0aGUgZW1wdHkgcG9wdXAgaW4gdGhlIGNvbWJvIGJveCBhcmVh Ci0gICAgICAgICAgICBtX21lbnVQb3NpdGlvbi5zZXRZKG1fbWVudVBvc2l0aW9uLnkoKSAtIHJl Y3QuaGVpZ2h0KCkgLyAyKTsKKyAgICAgICAgfQorICAgIH0gZWxzZSB7CisgICAgICAgIC8vIENl bnRlciB2ZXJ0aWNhbGx5IHRoZSBlbXB0eSBwb3B1cCBpbiB0aGUgY29tYm8gYm94IGFyZWEKKyAg ICAgICAgbV9tZW51UG9zaXRpb24uc2V0WShtX21lbnVQb3NpdGlvbi55KCkgLSByZWN0LmhlaWdo dCgpIC8gMik7CisgICAgfQogCiAgICAgZ19saXN0X2ZyZWUoY2hpbGRyZW4pOwogICAgIGd0a19t ZW51X3BvcHVwKG1fcG9wdXAuZ2V0KCksIDAsIDAsIHJlaW50ZXJwcmV0X2Nhc3Q8R3RrTWVudVBv c2l0aW9uRnVuYz4obWVudVBvc2l0aW9uRnVuY3Rpb24pLCB0aGlzLCAwLCBndGtfZ2V0X2N1cnJl bnRfZXZlbnRfdGltZSgpKTsK