27763 2009-07-28 06:37:42 -0700 PopupMenuQt lacks proper separator 2009-07-28 07:41:50 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 mifenton webkit-unassigned manyoso oldest_to_newest 135178 0 mifenton 2009-07-28 06:37:42 -0700 As marked by a FIXME in PopupMenuQt.cpp, the separator item used is a hardcoded string of "---". 135183 1 33622 mifenton 2009-07-28 06:50:35 -0700 Created attachment 33622 Patch to replace separator and fix include order. 135190 2 33622 manyoso 2009-07-28 07:09:35 -0700 Comment on attachment 33622 Patch to replace separator and fix include order. > if (client()->itemIsSeparator(i)) { > - //FIXME: better seperator item > - m_popup->insertItem(i, QString::fromLatin1("---")); > + m_popup->insertSeparator(i); > } else { Looks like you can remove the braces now from the if clause. cpplint didn't catch it? Also, you can go ahead and remove the #if 0 code. If it is important somehow, that's what we have revision control systems for :) 135195 3 33629 mifenton 2009-07-28 07:22:11 -0700 Created attachment 33629 Improved Style patch Thanks for the quick review. This patch removes the braces for both the if and the else as well as removes the unimplemented code block. 135198 4 33630 mifenton 2009-07-28 07:37:13 -0700 Created attachment 33630 Remove extra brace from patch. 135199 5 manyoso 2009-07-28 07:41:50 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/platform/qt/PopupMenuQt.cpp Committed r46483 M WebCore/ChangeLog M WebCore/platform/qt/PopupMenuQt.cpp r46483 = e84fb64b14709fba197a19c78e20c2076ee79ea2 (git-svn) No changes between current HEAD and refs/remotes/git-svn Resetting to the latest refs/remotes/git-svn http://trac.webkit.org/changeset/46483 33622 2009-07-28 06:50:35 -0700 2009-07-28 07:22:11 -0700 Patch to replace separator and fix include order. PopupMenuQtSeparatorPatch.diff text/plain 1519 mifenton ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YzI5MTg4Yy4uOWJlZWM3MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0wNy0yOCAgTWlrZSBGZW50b24g IDxtaWtlLmZlbnRvbkB0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBoYXJkY29kZWQgc2VwYXJhdG9yIHRleHQg d2l0aCBwcm9wZXIgc2VwYXJhdG9yLgorICAgICAgICBBbHNvIGFkanVzdHMgaW5jbHVkZSBvcmRl ciBhcyBwZXIgc3R5bGUgZ3VpZGVsaW5lcy4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc3NjMKKworICAgICAgICAqIHBsYXRmb3JtL3F0L1BvcHVw TWVudVF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVudTo6cG9wdWxhdGUpOgorCiAy MDA5LTA3LTI3ICBUb3IgQXJuZSBWZXN0YsO4ICA8dG9yLmFybmUudmVzdGJvQG5va2lhLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvcGxhdGZvcm0vcXQvUG9wdXBNZW51UXQuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9xdC9Qb3B1 cE1lbnVRdC5jcHAKaW5kZXggODY3ZTRlYS4uNjExZjE0YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9w bGF0Zm9ybS9xdC9Qb3B1cE1lbnVRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9xdC9Qb3B1 cE1lbnVRdC5jcHAKQEAgLTM0LDEwICszNCwxMCBAQAogCiAjaW5jbHVkZSA8UUFjdGlvbj4KICNp bmNsdWRlIDxRRGVidWc+Ci0jaW5jbHVkZSA8UU1lbnU+Ci0jaW5jbHVkZSA8UVBvaW50PgogI2lu Y2x1ZGUgPFFMaXN0V2lkZ2V0PgogI2luY2x1ZGUgPFFMaXN0V2lkZ2V0SXRlbT4KKyNpbmNsdWRl IDxRTWVudT4KKyNpbmNsdWRlIDxRUG9pbnQ+CiAjaW5jbHVkZSA8UVdpZGdldEFjdGlvbj4KIAog bmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNjYsOCArNjYsNyBAQCB2b2lkIFBvcHVwTWVudTo6cG9w dWxhdGUoY29uc3QgSW50UmVjdCYgcikKICAgICBpbnQgc2l6ZSA9IGNsaWVudCgpLT5saXN0U2l6 ZSgpOwogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgc2l6ZTsgaSsrKSB7CiAgICAgICAgIGlmIChj bGllbnQoKS0+aXRlbUlzU2VwYXJhdG9yKGkpKSB7Ci0gICAgICAgICAgICAvL0ZJWE1FOiBiZXR0 ZXIgc2VwZXJhdG9yIGl0ZW0KLSAgICAgICAgICAgIG1fcG9wdXAtPmluc2VydEl0ZW0oaSwgUVN0 cmluZzo6ZnJvbUxhdGluMSgiLS0tIikpOworICAgICAgICAgICAgbV9wb3B1cC0+aW5zZXJ0U2Vw YXJhdG9yKGkpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgLy9Qb3B1cE1lbnVTdHls ZSBzdHlsZSA9IGNsaWVudCgpLT5pdGVtU3R5bGUoaSk7CiAgICAgICAgICAgICBtX3BvcHVwLT5p bnNlcnRJdGVtKGksIGNsaWVudCgpLT5pdGVtVGV4dChpKSk7Cg== 33629 2009-07-28 07:22:11 -0700 2009-07-28 07:37:13 -0700 Improved Style patch PopupMenuQtSeparatorPatch.diff text/plain 1994 mifenton ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YzI5MTg4Yy4uOWJlZWM3MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0wNy0yOCAgTWlrZSBGZW50b24g IDxtaWtlLmZlbnRvbkB0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBoYXJkY29kZWQgc2VwYXJhdG9yIHRleHQg d2l0aCBwcm9wZXIgc2VwYXJhdG9yLgorICAgICAgICBBbHNvIGFkanVzdHMgaW5jbHVkZSBvcmRl ciBhcyBwZXIgc3R5bGUgZ3VpZGVsaW5lcy4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc3NjMKKworICAgICAgICAqIHBsYXRmb3JtL3F0L1BvcHVw TWVudVF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVudTo6cG9wdWxhdGUpOgorCiAy MDA5LTA3LTI3ICBUb3IgQXJuZSBWZXN0YsO4ICA8dG9yLmFybmUudmVzdGJvQG5va2lhLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvcGxhdGZvcm0vcXQvUG9wdXBNZW51UXQuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9xdC9Qb3B1 cE1lbnVRdC5jcHAKaW5kZXggODY3ZTRlYS4uZWUxZGQwNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9w bGF0Zm9ybS9xdC9Qb3B1cE1lbnVRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9xdC9Qb3B1 cE1lbnVRdC5jcHAKQEAgLTM0LDEwICszNCwxMCBAQAogCiAjaW5jbHVkZSA8UUFjdGlvbj4KICNp bmNsdWRlIDxRRGVidWc+Ci0jaW5jbHVkZSA8UU1lbnU+Ci0jaW5jbHVkZSA8UVBvaW50PgogI2lu Y2x1ZGUgPFFMaXN0V2lkZ2V0PgogI2luY2x1ZGUgPFFMaXN0V2lkZ2V0SXRlbT4KKyNpbmNsdWRl IDxRTWVudT4KKyNpbmNsdWRlIDxRUG9pbnQ+CiAjaW5jbHVkZSA8UVdpZGdldEFjdGlvbj4KIAog bmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNjUsMjMgKzY1LDEwIEBAIHZvaWQgUG9wdXBNZW51Ojpw b3B1bGF0ZShjb25zdCBJbnRSZWN0JiByKQogCiAgICAgaW50IHNpemUgPSBjbGllbnQoKS0+bGlz dFNpemUoKTsKICAgICBmb3IgKGludCBpID0gMDsgaSA8IHNpemU7IGkrKykgewotICAgICAgICBp ZiAoY2xpZW50KCktPml0ZW1Jc1NlcGFyYXRvcihpKSkgewotICAgICAgICAgICAgLy9GSVhNRTog YmV0dGVyIHNlcGVyYXRvciBpdGVtCi0gICAgICAgICAgICBtX3BvcHVwLT5pbnNlcnRJdGVtKGks IFFTdHJpbmc6OmZyb21MYXRpbjEoIi0tLSIpKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAg ICAgIC8vUG9wdXBNZW51U3R5bGUgc3R5bGUgPSBjbGllbnQoKS0+aXRlbVN0eWxlKGkpOworICAg ICAgICBpZiAoY2xpZW50KCktPml0ZW1Jc1NlcGFyYXRvcihpKSkKKyAgICAgICAgICAgIG1fcG9w dXAtPmluc2VydFNlcGFyYXRvcihpKTsKKyAgICAgICAgZWxzZQogICAgICAgICAgICAgbV9wb3B1 cC0+aW5zZXJ0SXRlbShpLCBjbGllbnQoKS0+aXRlbVRleHQoaSkpOwotI2lmIDAKLSAgICAgICAg ICAgIGl0ZW0gPSBuZXcgUUxpc3RXaWRnZXRJdGVtKGNsaWVudCgpLT5pdGVtVGV4dChpKSk7Ci0g ICAgICAgICAgICBtX2FjdGlvbnMuaW5zZXJ0KGl0ZW0sIGkpOwotICAgICAgICAgICAgaWYgKHN0 eWxlLT5mb250KCkgIT0gRm9udCgpKQotICAgICAgICAgICAgICAgIGl0ZW0tPnNldEZvbnQoc3R5 bGUtPmZvbnQoKSk7Ci0KLSAgICAgICAgICAgIFF0OjpJdGVtRmxhZ3MgZmxhZ3MgPSBRdDo6SXRl bUlzU2VsZWN0YWJsZTsKLSAgICAgICAgICAgIGlmIChjbGllbnQoKS0+aXRlbUlzRW5hYmxlZChp KSkKLSAgICAgICAgICAgICAgICBmbGFncyB8PSBRdDo6SXRlbUlzRW5hYmxlZDsKLSAgICAgICAg ICAgIGl0ZW0tPnNldEZsYWdzKGZsYWdzKTsKLSNlbmRpZgogICAgICAgICB9CiAgICAgfQogfQo= 33630 2009-07-28 07:37:13 -0700 2009-07-28 07:38:54 -0700 Remove extra brace from patch. PopupMenuQtSeparatorPatch.diff text/plain 1995 mifenton ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YzI5MTg4Yy4uOWJlZWM3MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0wNy0yOCAgTWlrZSBGZW50b24g IDxtaWtlLmZlbnRvbkB0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBoYXJkY29kZWQgc2VwYXJhdG9yIHRleHQg d2l0aCBwcm9wZXIgc2VwYXJhdG9yLgorICAgICAgICBBbHNvIGFkanVzdHMgaW5jbHVkZSBvcmRl ciBhcyBwZXIgc3R5bGUgZ3VpZGVsaW5lcy4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc3NjMKKworICAgICAgICAqIHBsYXRmb3JtL3F0L1BvcHVw TWVudVF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVudTo6cG9wdWxhdGUpOgorCiAy MDA5LTA3LTI3ICBUb3IgQXJuZSBWZXN0YsO4ICA8dG9yLmFybmUudmVzdGJvQG5va2lhLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvcGxhdGZvcm0vcXQvUG9wdXBNZW51UXQuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9xdC9Qb3B1 cE1lbnVRdC5jcHAKaW5kZXggODY3ZTRlYS4uNjNhNzUyMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9w bGF0Zm9ybS9xdC9Qb3B1cE1lbnVRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9xdC9Qb3B1 cE1lbnVRdC5jcHAKQEAgLTM0LDEwICszNCwxMCBAQAogCiAjaW5jbHVkZSA8UUFjdGlvbj4KICNp bmNsdWRlIDxRRGVidWc+Ci0jaW5jbHVkZSA8UU1lbnU+Ci0jaW5jbHVkZSA8UVBvaW50PgogI2lu Y2x1ZGUgPFFMaXN0V2lkZ2V0PgogI2luY2x1ZGUgPFFMaXN0V2lkZ2V0SXRlbT4KKyNpbmNsdWRl IDxRTWVudT4KKyNpbmNsdWRlIDxRUG9pbnQ+CiAjaW5jbHVkZSA8UVdpZGdldEFjdGlvbj4KIAog bmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNjUsMjQgKzY1LDEwIEBAIHZvaWQgUG9wdXBNZW51Ojpw b3B1bGF0ZShjb25zdCBJbnRSZWN0JiByKQogCiAgICAgaW50IHNpemUgPSBjbGllbnQoKS0+bGlz dFNpemUoKTsKICAgICBmb3IgKGludCBpID0gMDsgaSA8IHNpemU7IGkrKykgewotICAgICAgICBp ZiAoY2xpZW50KCktPml0ZW1Jc1NlcGFyYXRvcihpKSkgewotICAgICAgICAgICAgLy9GSVhNRTog YmV0dGVyIHNlcGVyYXRvciBpdGVtCi0gICAgICAgICAgICBtX3BvcHVwLT5pbnNlcnRJdGVtKGks IFFTdHJpbmc6OmZyb21MYXRpbjEoIi0tLSIpKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAg ICAgIC8vUG9wdXBNZW51U3R5bGUgc3R5bGUgPSBjbGllbnQoKS0+aXRlbVN0eWxlKGkpOworICAg ICAgICBpZiAoY2xpZW50KCktPml0ZW1Jc1NlcGFyYXRvcihpKSkKKyAgICAgICAgICAgIG1fcG9w dXAtPmluc2VydFNlcGFyYXRvcihpKTsKKyAgICAgICAgZWxzZQogICAgICAgICAgICAgbV9wb3B1 cC0+aW5zZXJ0SXRlbShpLCBjbGllbnQoKS0+aXRlbVRleHQoaSkpOwotI2lmIDAKLSAgICAgICAg ICAgIGl0ZW0gPSBuZXcgUUxpc3RXaWRnZXRJdGVtKGNsaWVudCgpLT5pdGVtVGV4dChpKSk7Ci0g ICAgICAgICAgICBtX2FjdGlvbnMuaW5zZXJ0KGl0ZW0sIGkpOwotICAgICAgICAgICAgaWYgKHN0 eWxlLT5mb250KCkgIT0gRm9udCgpKQotICAgICAgICAgICAgICAgIGl0ZW0tPnNldEZvbnQoc3R5 bGUtPmZvbnQoKSk7Ci0KLSAgICAgICAgICAgIFF0OjpJdGVtRmxhZ3MgZmxhZ3MgPSBRdDo6SXRl bUlzU2VsZWN0YWJsZTsKLSAgICAgICAgICAgIGlmIChjbGllbnQoKS0+aXRlbUlzRW5hYmxlZChp KSkKLSAgICAgICAgICAgICAgICBmbGFncyB8PSBRdDo6SXRlbUlzRW5hYmxlZDsKLSAgICAgICAg ICAgIGl0ZW0tPnNldEZsYWdzKGZsYWdzKTsKLSNlbmRpZgotICAgICAgICB9CiAgICAgfQogfQoK