74178 2011-12-09 06:20:34 -0800 Add new CSS nth-children parsing tests 2011-12-11 23:45:53 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 69083 1 zherczeg webkit-unassigned darin macpherson webkit.review.bot oldest_to_newest 518232 0 zherczeg 2011-12-09 06:20:34 -0800 The test covers several valid and invalid nth-child tokens. 518238 1 118570 zherczeg 2011-12-09 06:45:24 -0800 Created attachment 118570 patch 518295 2 118570 darin 2011-12-09 09:35:25 -0800 Comment on attachment 118570 patch View in context: https://bugs.webkit.org/attachment.cgi?id=118570&action=review > Source/WebCore/css/CSSParser.cpp:8092 > // The tokenizer checks for the construct of an+b. > // nth can also accept "n", "odd" or "even" but should not accept any other token. > - return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") || equalIgnoringCase(token, "n"); > + return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") > + || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); The comment now does not match the code. There is no clue here why "-n" is something we need to allow here. 518313 3 zherczeg 2011-12-09 10:04:17 -0800 > The comment now does not match the code. There is no clue here why "-n" is something we need to allow here. Thanks for the review. I'll fix the comment and land manually. 518314 4 darin 2011-12-09 10:06:14 -0800 When fixing the comment I suggest removing the part that says what the code does, since the code already seems to say that clearly enough, and enhancing the aspect of comment that says *why* the code does what it does. 519050 5 zherczeg 2011-12-11 23:45:53 -0800 Changed the comment to: // The tokenizer checks for the construct of an+b. // However, since the {ident} rule precedes the {nth} rule, some of those // tokens are identified as string literal. Furthermore we need to accept // "odd" and "even" which does not match to an+b. And landed: http://trac.webkit.org/changeset/102560 118570 2011-12-09 06:45:24 -0800 2011-12-09 10:03:25 -0800 patch 0001-nth-child.patch text/plain 7068 zherczeg RnJvbSAxOTE3ZDBiMTVmNjdlNGNlNzk2MGQwNzFmZjliMzQyMTdlYzQxNDYzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBab2x0YW4gSGVyY3plZyA8emhlcmN6ZWdAd2Via2l0Lm9yZz4K RGF0ZTogRnJpLCA5IERlYyAyMDExIDA2OjQyOjQyIC0wODAwClN1YmplY3Q6IFtQQVRDSF0gbnRo LWNoaWxkCgotLS0KIExheW91dFRlc3RzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHwgICAxMiArKysKIC4uLi9mYXN0L2Nzcy9wYXJzaW5nLWNzcy1udGgtY2hpbGQtZXhw ZWN0ZWQudHh0ICAgIHwgICA1MSArKysrKysrKysrCiBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9wYXJz aW5nLWNzcy1udGgtY2hpbGQuaHRtbCAgICB8ICAxMDAgKysrKysrKysrKysrKysrKysrKysKIFNv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxMiAr KysKIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwICAgICAgICAgICAgICAgICAgIHwg ICAgMyArLQogNSBmaWxlcyBjaGFuZ2VkLCAxNzcgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbnMo LSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9wYXJzaW5nLWNzcy1u dGgtY2hpbGQtZXhwZWN0ZWQudHh0CiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvZmFz dC9jc3MvcGFyc2luZy1jc3MtbnRoLWNoaWxkLmh0bWwKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjgxNjc5NC4uZGE2Mjcw OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDExLTEyLTA5ICBab2x0YW4gSGVyY3plZyAgPHpo ZXJjemVnQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIG5ldyBDU1MgbnRoLWNoaWxkcmVuIHBh cnNpbmcgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTc0MTc4CisKKyAgICAgICAgVGhlIHRlc3QgY292ZXJzIHNldmVyYWwgdmFsaWQgYW5kIGlu dmFsaWQgbnRoLWNoaWxkIHRva2Vucy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIGZhc3QvY3NzL3BhcnNpbmctY3NzLW50aC1jaGlsZC1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvY3NzL3BhcnNpbmctY3NzLW50aC1jaGlsZC5o dG1sOiBBZGRlZC4KKwogMjAxMS0xMi0wOCAgVGFrYXNoaSBUb3lvc2hpbWEgIDx0b3lvc2hpbUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgRml4IGZhaWxlZCBsYXlvdXQgdGVzdCwgYnVmZmVyZWRB bW91bnQtYWZ0ZXItY2xvc2UtaW4tYnVzeS5odG1sCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L2Nzcy9wYXJzaW5nLWNzcy1udGgtY2hpbGQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv ZmFzdC9jc3MvcGFyc2luZy1jc3MtbnRoLWNoaWxkLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwLi5mOWJmNDY1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9jc3MvcGFyc2luZy1jc3MtbnRoLWNoaWxkLWV4cGVjdGVkLnR4dApAQCAtMCww ICsxLDUxIEBACitUZXN0IHBhcnNpbmcgb2YgQ1NTIG50aC1jaGlsZCB0b2tlbnMuCisKK1NVQ0NF U1MKKworUnVsZXMgZnJvbSB0aGUgc3R5bGVzaGVldDoKKworI2E6bnRoLWNoaWxkKDFuKzApIHsg Y29sb3I6IGdyZWVuOyB9CisjYjpudGgtY2hpbGQobiswKSB7IGNvbG9yOiBncmVlbjsgfQorI2M6 bnRoLWNoaWxkKG4pIHsgY29sb3I6IGdyZWVuOyB9CisjZDpudGgtY2hpbGQoLW4rMCkgeyBjb2xv cjogZ3JlZW47IH0KKyNlOm50aC1jaGlsZCgtbikgeyBjb2xvcjogZ3JlZW47IH0KKyNmOm50aC1j aGlsZCgxTiswKSB7IGNvbG9yOiBncmVlbjsgfQorI2c6bnRoLWNoaWxkKE4rMCkgeyBjb2xvcjog Z3JlZW47IH0KKyNoOm50aC1jaGlsZChOKSB7IGNvbG9yOiBncmVlbjsgfQorI2k6bnRoLWNoaWxk KC1OKzApIHsgY29sb3I6IGdyZWVuOyB9CisjajpudGgtY2hpbGQoLU4pIHsgY29sb3I6IGdyZWVu OyB9CisjbDpudGgtY2hpbGQoLTFOCisgIC0KKyAgMTIzKSB7IGNvbG9yOiBncmVlbjsgfQorI206 bnRoLWNoaWxkKE4tIDEyMykgeyBjb2xvcjogZ3JlZW47IH0KKyNvOm50aC1jaGlsZCgyM24KKwor ICsKKworMTIzKSB7IGNvbG9yOiBncmVlbjsgfQorI3Q6bnRoLWNoaWxkKCtuKzMpIHsgY29sb3I6 IGdyZWVuOyB9CisjdTpudGgtY2hpbGQoK24gKyA3KSB7IGNvbG9yOiBncmVlbjsgfQorRXhwZWN0 ZWQgcmVzdWx0OgorCisjYTpudGgtY2hpbGQoMW4rMCkgeyBjb2xvcjogZ3JlZW47IH0KKyNiOm50 aC1jaGlsZChuKzApIHsgY29sb3I6IGdyZWVuOyB9CisjYzpudGgtY2hpbGQobikgeyBjb2xvcjog Z3JlZW47IH0KKyNkOm50aC1jaGlsZCgtbiswKSB7IGNvbG9yOiBncmVlbjsgfQorI2U6bnRoLWNo aWxkKC1uKSB7IGNvbG9yOiBncmVlbjsgfQorI2Y6bnRoLWNoaWxkKDFOKzApIHsgY29sb3I6IGdy ZWVuOyB9CisjZzpudGgtY2hpbGQoTiswKSB7IGNvbG9yOiBncmVlbjsgfQorI2g6bnRoLWNoaWxk KE4pIHsgY29sb3I6IGdyZWVuOyB9CisjaTpudGgtY2hpbGQoLU4rMCkgeyBjb2xvcjogZ3JlZW47 IH0KKyNqOm50aC1jaGlsZCgtTikgeyBjb2xvcjogZ3JlZW47IH0KKyNsOm50aC1jaGlsZCgtMU4K KyAgLQorICAxMjMpIHsgY29sb3I6IGdyZWVuOyB9CisjbTpudGgtY2hpbGQoTi0gMTIzKSB7IGNv bG9yOiBncmVlbjsgfQorI286bnRoLWNoaWxkKDIzbgorCisgKworCisxMjMpIHsgY29sb3I6IGdy ZWVuOyB9CisjdDpudGgtY2hpbGQoK24rMykgeyBjb2xvcjogZ3JlZW47IH0KKyN1Om50aC1jaGls ZCgrbiArIDcpIHsgY29sb3I6IGdyZWVuOyB9CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvY3NzL3BhcnNpbmctY3NzLW50aC1jaGlsZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3Mv cGFyc2luZy1jc3MtbnRoLWNoaWxkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uOWFmNGEyZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL3Bh cnNpbmctY3NzLW50aC1jaGlsZC5odG1sCkBAIC0wLDAgKzEsMTAwIEBACis8aGVhZD4KKzxzdHls ZT4KKyNhOm50aC1jaGlsZCgxbiswKSB7IGNvbG9yOiBncmVlbjsgfQorI2I6bnRoLWNoaWxkKG4r MCkgIHsgY29sb3I6IGdyZWVuOyB9CisjYzpudGgtY2hpbGQobikgICAgeyBjb2xvcjogZ3JlZW47 IH0KKyNkOm50aC1jaGlsZCgtbiswKSB7IGNvbG9yOiBncmVlbjsgfQorI2U6bnRoLWNoaWxkKC1u KSAgIHsgY29sb3I6IGdyZWVuOyB9CisKKyNmOm50aC1jaGlsZCgxTiswKSB7IGNvbG9yOiBncmVl bjsgfQorI2c6bnRoLWNoaWxkKE4rMCkgIHsgY29sb3I6IGdyZWVuOyB9CisjaDpudGgtY2hpbGQo TikgICAgeyBjb2xvcjogZ3JlZW47IH0KKyNpOm50aC1jaGlsZCgtTiswKSB7IGNvbG9yOiBncmVl bjsgfQorI2o6bnRoLWNoaWxkKC1OKSAgIHsgY29sb3I6IGdyZWVuOyB9CisKKyNrOm50aC1jaGls ZCgrIDFuKSB7IGNvbG9yOiBncmVlbjsgfQorI2w6bnRoLWNoaWxkKC0xTgorICAtCisgIDEyMyAg KSB7IGNvbG9yOiBncmVlbjsgfQorI206bnRoLWNoaWxkKCAgTi0gMTIzKSB7IGNvbG9yOiBncmVl bjsgfQorI246bnRoLWNoaWxkKCAgbiArMTIgMykgeyBjb2xvcjogZ3JlZW47IH0KKyNvOm50aC1j aGlsZCggMjNuCisKKyArCisKKzEyMyAgKSB7IGNvbG9yOiBncmVlbjsgfQorI3A6bnRoLWNoaWxk KCAgMTIgbiApIHsgY29sb3I6IGdyZWVuOyB9CisjcTpudGgtY2hpbGQoKzEybi0wKzEpIHsgY29s b3I6IGdyZWVuOyB9CisjcjpudGgtY2hpbGQoKzEyTiAtLSAxKSB7IGNvbG9yOiBncmVlbjsgfQor I3M6bnRoLWNoaWxkKCsxMiBOICkgeyBjb2xvcjogZ3JlZW47IH0KKyN0Om50aC1jaGlsZCgrbisz KSB7IGNvbG9yOiBncmVlbjsgfQorI3U6bnRoLWNoaWxkKCArbiArIDcgKSB7IGNvbG9yOiBncmVl bjsgfQorI3Y6bnRoLWNoaWxkKCsgbiArIDcpIHsgY29sb3I6IGdyZWVuOyB9Cis8L3N0eWxlPgor Cis8c2NyaXB0PgorCisvKiogQ2hhbmdlcyB0aGUgcmVzdWx0IHRleHQgZm9udCBzaXplLiAqLwor ZnVuY3Rpb24gcnVuVGVzdCgpCit7CisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxl cikKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworCisgICAgdmFy IHJ1bGVzID0gZG9jdW1lbnQuc3R5bGVTaGVldHNbMF0uY3NzUnVsZXM7CisgICAgdmFyIHRleHQg PSAiIjsKKyAgICBmb3IgKHZhciBpID0gMDsgaSA8IHJ1bGVzLmxlbmd0aDsgaSsrKSB7CisgICAg ICAgIHRleHQgKz0gcnVsZXMuaXRlbShpKS5jc3NUZXh0OworICAgICAgICB0ZXh0ICs9ICJcbiI7 CisgICAgfQorCisgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInJlc3VsdCIpLmFwcGVuZENo aWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKHRleHQpKTsKKworICAgIGlmIChkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgicmVzdWx0IikuZmlyc3RDaGlsZC5kYXRhID09PSBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgiZXhwZWN0ZWQiKS5maXJzdENoaWxkLmRhdGEpCisgICAgICAgIGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCJtZXNzYWdlIikuZmlyc3RDaGlsZC5kYXRhID0gIlNVQ0NFU1MiOwor ICAgIGVsc2UKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm1lc3NhZ2UiKS5maXJz dENoaWxkLmRhdGEgPSAiRkFJTFVSRSI7Cit9CisKKzwvc2NyaXB0PgorCis8L2hlYWQ+CisKKzxi b2R5IG9ubG9hZD0icnVuVGVzdCgpIj4KKworPHA+VGVzdCBwYXJzaW5nIG9mIENTUyBudGgtY2hp bGQgdG9rZW5zLjwvcD4KKworPHAgaWQ9Im1lc3NhZ2UiPlRFU1QgRElEIE5PVCBDT01QTEVURTwv cD4KKworPHA+UnVsZXMgZnJvbSB0aGUgc3R5bGVzaGVldDo8L3A+CisKKzxwcmUgaWQ9InJlc3Vs dCI+PC9wcmU+CisKKzxwPkV4cGVjdGVkIHJlc3VsdDo8L3A+CisKKzxwcmUgaWQ9ImV4cGVjdGVk Ij4jYTpudGgtY2hpbGQoMW4rMCkgeyBjb2xvcjogZ3JlZW47IH0KKyNiOm50aC1jaGlsZChuKzAp IHsgY29sb3I6IGdyZWVuOyB9CisjYzpudGgtY2hpbGQobikgeyBjb2xvcjogZ3JlZW47IH0KKyNk Om50aC1jaGlsZCgtbiswKSB7IGNvbG9yOiBncmVlbjsgfQorI2U6bnRoLWNoaWxkKC1uKSB7IGNv bG9yOiBncmVlbjsgfQorI2Y6bnRoLWNoaWxkKDFOKzApIHsgY29sb3I6IGdyZWVuOyB9CisjZzpu dGgtY2hpbGQoTiswKSB7IGNvbG9yOiBncmVlbjsgfQorI2g6bnRoLWNoaWxkKE4pIHsgY29sb3I6 IGdyZWVuOyB9CisjaTpudGgtY2hpbGQoLU4rMCkgeyBjb2xvcjogZ3JlZW47IH0KKyNqOm50aC1j aGlsZCgtTikgeyBjb2xvcjogZ3JlZW47IH0KKyNsOm50aC1jaGlsZCgtMU4KKyAgLQorICAxMjMp IHsgY29sb3I6IGdyZWVuOyB9CisjbTpudGgtY2hpbGQoTi0gMTIzKSB7IGNvbG9yOiBncmVlbjsg fQorI286bnRoLWNoaWxkKDIzbgorCisgKworCisxMjMpIHsgY29sb3I6IGdyZWVuOyB9CisjdDpu dGgtY2hpbGQoK24rMykgeyBjb2xvcjogZ3JlZW47IH0KKyN1Om50aC1jaGlsZCgrbiArIDcpIHsg Y29sb3I6IGdyZWVuOyB9Cis8L3ByZT4KKworPHNjcmlwdD4KKworPC9zY3JpcHQ+Cis8L2JvZHk+ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggM2ZkYTQzZS4uY2EzMjM2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDExLTEyLTA5ICBab2x0YW4gSGVyY3plZyAgPHpoZXJjemVnQHdlYmtpdC5vcmc+CisK KyAgICAgICAgQWRkIG5ldyBDU1MgbnRoLWNoaWxkcmVuIHBhcnNpbmcgdGVzdHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0MTc4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogZmFzdC9jc3MvcGFy c2luZy1jc3MtbnRoLWNoaWxkLmh0bWwKKworICAgICAgICAqIGNzcy9DU1NQYXJzZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6aXNWYWxpZE50aFRva2VuKTogQWRkICItbiIgdG8gdGhlIHBvc3Np YmxlIGlkZW50aWZpZXJzLgorCiAyMDExLTEyLTA4ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZp ZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTAy MzIxLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAppbmRleCBiZjBiOTliLi40MGFjYzdlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTUGFyc2VyLmNwcApAQCAtODA4OCw3ICs4MDg4LDggQEAgYm9vbCBpc1ZhbGlk TnRoVG9rZW4oY29uc3QgQ1NTUGFyc2VyU3RyaW5nJiB0b2tlbikKIHsKICAgICAvLyBUaGUgdG9r ZW5pemVyIGNoZWNrcyBmb3IgdGhlIGNvbnN0cnVjdCBvZiBhbitiLgogICAgIC8vIG50aCBjYW4g YWxzbyBhY2NlcHQgIm4iLCAib2RkIiBvciAiZXZlbiIgYnV0IHNob3VsZCBub3QgYWNjZXB0IGFu eSBvdGhlciB0b2tlbi4KLSAgICByZXR1cm4gZXF1YWxJZ25vcmluZ0Nhc2UodG9rZW4sICJvZGQi KSB8fCBlcXVhbElnbm9yaW5nQ2FzZSh0b2tlbiwgImV2ZW4iKSB8fCBlcXVhbElnbm9yaW5nQ2Fz ZSh0b2tlbiwgIm4iKTsKKyAgICByZXR1cm4gZXF1YWxJZ25vcmluZ0Nhc2UodG9rZW4sICJvZGQi KSB8fCBlcXVhbElnbm9yaW5nQ2FzZSh0b2tlbiwgImV2ZW4iKQorICAgICAgICB8fCBlcXVhbEln bm9yaW5nQ2FzZSh0b2tlbiwgIm4iKSB8fCBlcXVhbElnbm9yaW5nQ2FzZSh0b2tlbiwgIi1uIik7 CiB9CiAKICNkZWZpbmUgWVlfREVDTCBpbnQgQ1NTUGFyc2VyOjpsZXgoKQotLSAKMS43LjIuNQoK