125254 2013-12-04 14:19:53 -0800 check-webkit-style: false positive warning for indentation of #ifdef code 2013-12-06 10:55:55 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dbates webkit-unassigned commit-queue gbalogh.u-szeged glenn llango.u-szeged tgergely.u-szeged oldest_to_newest 956604 0 dbates 2013-12-04 14:19:53 -0800 When processing the attachment #218443 (bug #125239), check-webkit-style emitted the following false positives: ERROR: Source/WebCore/rendering/RenderLayer.cpp:185: Wrong number of spaces before statement. (expected: 4) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayer.cpp:2725: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayer.cpp:2725: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderMenuList.cpp:81: Wrong number of spaces before statement. (expected: 4) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayerCompositor.cpp:432: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayerCompositor.cpp:433: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayerCompositor.cpp:435: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayerCompositor.cpp:437: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayerCompositor.cpp:446: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayerCompositor.cpp:447: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderFileUploadControl.cpp:106: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderFileUploadControl.cpp:107: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] Notice that all of these errors are with respect to code that is within a #ifdef/#else-block. 956813 1 gbalogh.u-szeged 2013-12-05 02:08:08 -0800 The commit 251bfc338f7f629cc2e3646bd0af707314bddb04 fix most of these issues. I will check the rest of them. Remaining: ERROR: Source/WebCore/rendering/RenderLayer.cpp:180: Wrong number of spaces before statement. (expected: 4) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayer.cpp:185: Wrong number of spaces before statement. (expected: 4) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayer.cpp:196: Wrong number of spaces before statement. (expected: 4) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayer.cpp:199: Wrong number of spaces before statement. (expected: 4) [whitespace/indent] [4] ERROR: Source/WebCore/rendering/RenderLayer.cpp:3640: Wrong number of spaces before statement. (expected: 32) [whitespace/indent] [4] Checked on: commit a53256abaefeacb27f386aa7fd739b81636bc334 957182 2 218578 gbalogh.u-szeged 2013-12-06 01:54:39 -0800 Created attachment 218578 patch 957301 3 218578 commit-queue 2013-12-06 10:52:18 -0800 Comment on attachment 218578 patch Clearing flags on attachment: 218578 Committed r160229: <http://trac.webkit.org/changeset/160229> 957305 4 commit-queue 2013-12-06 10:55:55 -0800 All reviewed patches have been landed. Closing bug. 218578 2013-12-06 01:54:39 -0800 2013-12-06 10:52:02 -0800 patch f2672.diff text/plain 3068 gbalogh.u-szeged ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyZmQ5 ODdiLi43MGYyNjRiIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMTItMDYgIEdlcmdvIEJhbG9naCAgPGdlcnl4 eXpAaW5mLnUtc3plZ2VkLmh1PgorCisgICAgICAgIGNoZWNrLXdlYmtpdC1zdHlsZTogZmFsc2Ug cG9zaXRpdmUgd2FybmluZyBmb3IgaW5kZW50YXRpb24gb2YgI2lmZGVmIGNvZGUuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjUyNTQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5OgorICAgICAgICAoY2hlY2tfbWVtYmVyX2luaXRpYWxp emF0aW9uX2xpc3QpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMv Y3BwX3VuaXR0ZXN0LnB5OgorICAgICAgICAoV2ViS2l0U3R5bGVUZXN0LnRlc3RfbWVtYmVyX2lu aXRpYWxpemF0aW9uX2xpc3QpOgorCiAyMDEzLTEyLTA0ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3 ZWJraXQub3JnPgogCiAgICAgICAgIEVuYWJsZSBIVE1MVGVtcGxhdGVFbGVtZW50IGJ5IGRlZmF1 bHQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3Bw LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHAucHkKaW5kZXgg ZDVjMjc4Ni4uYjAyMWEwNSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHls ZS9jaGVja2Vycy9jcHAucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVj a2Vycy9jcHAucHkKQEAgLTE5ODYsNiArMTk4Niw3IEBAIGRlZiBjaGVja19tZW1iZXJfaW5pdGlh bGl6YXRpb25fbGlzdChjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGVycm9yKToKICAgICAjIEVh Y2ggbWVtYmVyIChhbmQgc3VwZXJjbGFzcykgc2hvdWxkIGJlIGluZGVudGVkIG9uIGEgc2VwYXJh dGUgbGluZSwKICAgICAjIHdpdGggdGhlIGNvbG9uIG9yIGNvbW1hIHByZWNlZGluZyB0aGUgbWVt YmVyIG9uIHRoYXQgbGluZS4KICAgICBiZWdpbl9saW5lID0gbGluZQorICAgICMgbWF0Y2ggdGhl IHN0YXJ0IG9mIGluaXRpYWxpemF0aW9uIGxpc3QKICAgICBpZiBzZWFyY2gocideKD9QPGluZGVu dGF0aW9uPlxzKikoKGV4cGxpY2l0XHMrKT9bXlxzXStcKC4qXClccz9cOnxeXHMqXDopLipbXjtd KiQnLCBsaW5lKToKICAgICAgICAgaWYgc2VhcmNoKHInW146XVw6W15cOlxzXSsnLCBsaW5lKToK ICAgICAgICAgICAgIGVycm9yKGxpbmVfbnVtYmVyLCAnd2hpdGVzcGFjZS9pbml0JywgNCwKQEAg LTIwMDEsOCArMjAwMiw4IEBAIGRlZiBjaGVja19tZW1iZXJfaW5pdGlhbGl6YXRpb25fbGlzdChj bGVhbl9saW5lcywgbGluZV9udW1iZXIsIGVycm9yKToKICAgICAgICAgaW5uZXJfaW5kZW50YXRp b24gPSBpbmRlbnRhdGlvbiArICcgJyAqIDQKIAogICAgICAgICB3aGlsZShub3Qgc2VhcmNoKHIn eycsIGxpbmUpKToKLSAgICAgICAgICAgICMgRG9uJ3QgY2hlY2sgaW5oZXJpdGFuY2Ugc3R5bGUK LSAgICAgICAgICAgIGlmIHNlYXJjaChyJ1xTXCguKlwpJywgbGluZSk6CisgICAgICAgICAgICAj IERvbid0IGNoZWNrIGluaGVyaXRhbmNlIHN0eWxlIGFuZCBwcmVjb21waWxlciBkaXJlY3RpdmVz CisgICAgICAgICAgICBpZiAobm90IGxpbmUuc3RhcnRzd2l0aCgnIycpKSBhbmQgc2VhcmNoKHIn XFNcKC4qXCknLCBsaW5lKToKICAgICAgICAgICAgICAgICBpZiBub3QgbGluZS5zdGFydHN3aXRo KGlubmVyX2luZGVudGF0aW9uKSBhbmQgYmVnaW5fbGluZSAhPSBsaW5lOgogICAgICAgICAgICAg ICAgICAgICBlcnJvcihsaW5lX251bWJlciwgJ3doaXRlc3BhY2UvaW5kZW50JywgNCwKICAgICAg ICAgICAgICAgICAgICAgICAgICdXcm9uZyBudW1iZXIgb2Ygc3BhY2VzIGJlZm9yZSBzdGF0ZW1l bnQuIChleHBlY3RlZDogJWQpJyAlIGxlbihpbm5lcl9pbmRlbnRhdGlvbikpCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcF91bml0dGVzdC5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5Cmlu ZGV4IDEzNjk2OTEuLjdjYmY1NGMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv c3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5CkBAIC00OTY1LDYgKzQ5NjUsMTggQEAg Y2xhc3MgV2ViS2l0U3R5bGVUZXN0KENwcFN0eWxlVGVzdEJhc2UpOgogICAgICAgICAgJ1dyb25n IG51bWJlciBvZiBzcGFjZXMgYmVmb3JlIHN0YXRlbWVudC4gKGV4cGVjdGVkOiAxMiknCiAgICAg ICAgICAnICBbd2hpdGVzcGFjZS9pbmRlbnRdIFs0XScsCiAgICAgICAgICAnTWlzc2luZyBzcGFj ZSBhZnRlciAsICBbd2hpdGVzcGFjZS9jb21tYV0gWzNdJ10pCisKKyAgICAgICAgZmluZV9leGFt cGxlID0gKAorICAgICAgICAgICAgJ015Q2xhc3M6Ok15Q2xhc3MoRG9jdW1lbnQqIGRvYylcbicK KyAgICAgICAgICAgICcgICAgOiBNeVN1cGVyQ2xhc3MoKVxuJworICAgICAgICAgICAgJyNpZiAh QkxBKEZPTylcbicKKyAgICAgICAgICAgICcgICAgLCBNeVN1cGVyQ2xhc3MoKVxuJworICAgICAg ICAgICAgJyAgICAsIG1fZG9jKDApXG4nCisgICAgICAgICAgICAnI2VuZGlmXG4nCisgICAgICAg ICAgICAnICAgICwgbV9teU1lbWJlcigwKVxuJworICAgICAgICAgICAgJ3sgfScpCisgICAgICAg IHNlbGYuYXNzZXJ0X211bHRpX2xpbmVfbGludChmaW5lX2V4YW1wbGUsICcnKQorCiAgICAgICAg IHNlbGYuYXNzZXJ0X211bHRpX2xpbmVfbGludCgnJydcCiAgICAgICAgIE15Q2xhc3M6Ok15Q2xh c3MoRG9jdW1lbnQqIGRvYykKICAgICAgICAgICAgIDpNeVN1cGVyQ2xhc3MoKQo=