84985 2012-04-26 12:01:20 -0700 Counter still gets incremented when counter-increment is set to none 2013-04-08 10:39:40 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 max.hong.shen webkit-unassigned carol commit-queue esprehn+autocc esprehn hyatt inferno jchaffraix macpherson menard ojan.autocc rniwa tony webkit.review.bot oldest_to_newest 610795 0 max.hong.shen 2012-04-26 12:01:20 -0700 http://test.csswg.org/suites/css2.1/20110323/html4/counter-increment-053.htm test fails. According to w3c spec (http://www.w3.org/TR/CSS2/generate.html#propdef-counter-increment), A value of 'none' on its own means no counters are reset, resp. incremented. 610842 1 139048 max.hong.shen 2012-04-26 12:46:11 -0700 Created attachment 139048 First try 766532 2 139048 bfulgham 2012-11-14 00:04:41 -0800 Comment on attachment 139048 First try This patch looks correct. Is there a reason it has not been reviewed? Does it violate some aspect of the counter specification? 767060 3 tony 2012-11-14 10:57:27 -0800 Elliott was in the counters code recently, maybe he would like to do an unofficial review? 767299 4 esprehn 2012-11-14 14:11:36 -0800 I'll review later today, but looking quickly this doesn't seem right since you transform none into counter-increment: 0 for every counter which creates implicit scopes. 787583 5 max.hong.shen 2012-12-10 11:30:23 -0800 Thanks for comments, guys. It is an old patch and I will rework on it. (In reply to comment #4) > I'll review later today, but looking quickly this doesn't seem right since you transform none into counter-increment: 0 for every counter which creates implicit scopes. 844228 6 139048 jchaffraix 2013-02-28 10:58:13 -0800 Comment on attachment 139048 First try Punting the patch out of the review queue based on Elliot's comment. If you come up with a new patch covering implicit scopes, I would be happy to look at it. 860827 7 194371 max.hong.shen 2013-03-21 16:09:24 -0700 Created attachment 194371 clear counter increment when its value is none 870858 8 194371 commit-queue 2013-04-08 10:39:37 -0700 Comment on attachment 194371 clear counter increment when its value is none Clearing flags on attachment: 194371 Committed r147930: <http://trac.webkit.org/changeset/147930> 870859 9 commit-queue 2013-04-08 10:39:40 -0700 All reviewed patches have been landed. Closing bug. 139048 2012-04-26 12:46:11 -0700 2013-03-21 16:09:24 -0700 First try 84985v1.patch text/plain 7856 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNTMzOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0LTI2ICBZaSBTaGVu ICA8eWkuNC5zaGVuQG5va2lhLmNvbT4KKworICAgICAgICBDb3VudGVyIHN0aWxsIGdldHMgaW5j cmVtZW50ZWQgd2hlbiBjb3VudGVyLWluY3JlbWVudCBpcyBzZXQgdG8gbm9uZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ5ODUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHRoZSBjb3VudGVyLWlu Y3JlbWVudCBpcyBzZXQgdG8gbm9uZSwgU3l0bGVCdWlsZGVyIHNob3VsZCBjaGFuZ2UgdGhlIGV4 aXN0aW5nIGNvdW50ZXJzJworICAgICAgICBpbmNyZW1lbnQgdmFsdWUgdG8gMCBpbiB0aGUgbWF0 Y2hlZCBlbGVtZW50LgorCisgICAgICAgIFRlc3Q6IE5ldyB0ZXN0IGNhc2VzIGFkZGVkIGluIGZh c3QvY3NzL2NvdW50ZXJzL2NvdW50ZXItaW5jcmVtZW50LXRlc3RzLmh0bQorCisgICAgICAgICog Y3NzL1N0eWxlQnVpbGRlci5jcHA6CisgICAgICAgIChBcHBseVByb3BlcnR5Q291bnRlcik6Cisg ICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5Q291bnRlcjo6YXBwbHlOb25lVmFsdWUpOgor ICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUNvdW50ZXI6OmFwcGx5VmFsdWUpOgorCiAy MDEyLTA0LTI2ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBJ bXBsZW1lbnQgU3R5bGVTaGVldEludGVybmFsIGNvcHlpbmcKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2Nzcy9TdHlsZUJ1aWxkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9T dHlsZUJ1aWxkZXIuY3BwCShyZXZpc2lvbiAxMTUzMzcpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3Mv U3R5bGVCdWlsZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAwMiwxMCArMTAwMiwyOCBAQCBw dWJsaWM6CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CisKKyAgICBzdGF0aWMgdm9p ZCBhcHBseU5vbmVWYWx1ZShTdHlsZVJlc29sdmVyKiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSog dmFsdWUpCisgICAgeworICAgICAgICBpZiAoY291bnRlckJlaGF2aW9yID09IFJlc2V0IHx8ICF2 YWx1ZS0+aXNQcmltaXRpdmVWYWx1ZSgpIHx8IHN0YXRpY19jYXN0PENTU1ByaW1pdGl2ZVZhbHVl Kj4odmFsdWUpLT5nZXRJZGVudCgpICE9IENTU1ZhbHVlTm9uZSkKKyAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgCisgICAgICAgIENvdW50ZXJEaXJlY3RpdmVNYXAmIG1hcCA9IHN0eWxlUmVz b2x2ZXItPnN0eWxlKCktPmFjY2Vzc0NvdW50ZXJEaXJlY3RpdmVzKCk7CisgICAgICAgIHR5cGVk ZWYgQ291bnRlckRpcmVjdGl2ZU1hcDo6aXRlcmF0b3IgSXRlcmF0b3I7ICAgICAgICAKKyAgICAg ICAgSXRlcmF0b3IgZW5kID0gbWFwLmVuZCgpOworICAgICAgICBmb3IgKEl0ZXJhdG9yIGl0ID0g bWFwLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgeworICAgICAgICAgICAgQ291bnRlckRpcmVj dGl2ZXMmIGRpcmVjdGl2ZXMgPSBpdC0+c2Vjb25kOworICAgICAgICAgICAgZGlyZWN0aXZlcy5t X2luY3JlbWVudCA9IHRydWU7CisgICAgICAgICAgICBkaXJlY3RpdmVzLm1faW5jcmVtZW50VmFs dWUgPSAwOworICAgICAgICB9CisgICAgfQorCiAgICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZShT dHlsZVJlc29sdmVyKiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSogdmFsdWUpCiAgICAgewotICAg ICAgICBpZiAoIXZhbHVlLT5pc1ZhbHVlTGlzdCgpKQorICAgICAgICBpZiAoIXZhbHVlLT5pc1Zh bHVlTGlzdCgpKSB7CisgICAgICAgICAgICBhcHBseU5vbmVWYWx1ZShzdHlsZVJlc29sdmVyLCB2 YWx1ZSk7CiAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KIAogICAgICAgICBDU1NWYWx1 ZUxpc3QqIGxpc3QgPSBzdGF0aWNfY2FzdDxDU1NWYWx1ZUxpc3QqPih2YWx1ZSk7CiAKSW5kZXg6 IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cJKHJldmlzaW9uIDExNTMzOCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA0LTI2ICBZaSBTaGVuICA8eWkuNC5zaGVuQG5v a2lhLmNvbT4KKworICAgICAgICBDb3VudGVyIHN0aWxsIGdldHMgaW5jcmVtZW50ZWQgd2hlbiBj b3VudGVyLWluY3JlbWVudCBpcyBzZXQgdG8gbm9uZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ5ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHRoZSBjb3VudGVyLWluY3JlbWVudCBpcyBzZXQg dG8gbm9uZSwgU3l0bGVCdWlsZGVyIHNob3VsZCBjaGFuZ2UgdGhlIGV4aXN0aW5nIGNvdW50ZXJz JworICAgICAgICBpbmNyZW1lbnQgdmFsdWUgdG8gMCBpbiB0aGUgbWF0Y2hlZCBlbGVtZW50Lgor CisgICAgICAgICogZmFzdC9jc3MvY291bnRlcnMvY291bnRlci1pbmNyZW1lbnQtdGVzdHMtZXhw ZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvY3NzL2NvdW50ZXJzL2NvdW50ZXItaW5jcmVtZW50 LXRlc3RzLmh0bToKKwogMjAxMi0wNC0yNiAgUGhpbGlwIFJvZ2VycyAgPHBkckBnb29nbGUuY29t PgogCiAgICAgICAgIEZpeCBTa2lhJ3MgU2tQYXRoQ29udGFpbnNQb2ludCB0byB3b3JrIHdpdGgg c3ViLXBpeGVsIGFjY3VyYWN5CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9jb3VudGVycy9j b3VudGVyLWluY3JlbWVudC10ZXN0cy1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvZmFzdC9jc3MvY291bnRlcnMvY291bnRlci1pbmNyZW1lbnQtdGVzdHMtZXhwZWN0ZWQu dHh0CShyZXZpc2lvbiAxMTUzMzcpCisrKyBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9jb3VudGVycy9j b3VudGVyLWluY3JlbWVudC10ZXN0cy1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTU1 LDQgKzU1LDExIEBAIFBBU1MgbGF5b3V0VGVzdENvbnRyb2xsZXIuY291bnRlclZhbHVlRm8KIFBB U1MgbGF5b3V0VGVzdENvbnRyb2xsZXIuY291bnRlclZhbHVlRm9yRWxlbWVudEJ5SWQoJ3Rlc3Q1 NCcpIGlzICcxMCcKIFBBU1MgbGF5b3V0VGVzdENvbnRyb2xsZXIuY291bnRlclZhbHVlRm9yRWxl bWVudEJ5SWQoJ3Rlc3Q1NScpIGlzICcxJwogUEFTUyBsYXlvdXRUZXN0Q29udHJvbGxlci5jb3Vu dGVyVmFsdWVGb3JFbGVtZW50QnlJZCgndGVzdDU2JykgaXMgJy0yMTQ3NDgzNjQ4JwotCitQQVNT IGxheW91dFRlc3RDb250cm9sbGVyLmNvdW50ZXJWYWx1ZUZvckVsZW1lbnRCeUlkKCd0ZXN0NTcn KSBpcyAnNScKK1BBU1MgbGF5b3V0VGVzdENvbnRyb2xsZXIuY291bnRlclZhbHVlRm9yRWxlbWVu dEJ5SWQoJ25vbmU1NycpIGlzICc1JworUEFTUyBsYXlvdXRUZXN0Q29udHJvbGxlci5jb3VudGVy VmFsdWVGb3JFbGVtZW50QnlJZCgnd3JhcHBlcjU4JykgaXMgJzUnCitQQVNTIGxheW91dFRlc3RD b250cm9sbGVyLmNvdW50ZXJWYWx1ZUZvckVsZW1lbnRCeUlkKCd0ZXN0NThhJykgaXMgJzUuMicK K1BBU1MgbGF5b3V0VGVzdENvbnRyb2xsZXIuY291bnRlclZhbHVlRm9yRWxlbWVudEJ5SWQoJ25v bmU1OCcpIGlzICc1LjInCitQQVNTIGxheW91dFRlc3RDb250cm9sbGVyLmNvdW50ZXJWYWx1ZUZv ckVsZW1lbnRCeUlkKCdub25lNThhJykgaXMgJzUuNycKK1BBU1MgbGF5b3V0VGVzdENvbnRyb2xs ZXIuY291bnRlclZhbHVlRm9yRWxlbWVudEJ5SWQoJ3Rlc3Q1OGInKSBpcyAnNS4xMicKKyAgICAK SW5kZXg6IExheW91dFRlc3RzL2Zhc3QvY3NzL2NvdW50ZXJzL2NvdW50ZXItaW5jcmVtZW50LXRl c3RzLmh0bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9jb3VudGVycy9jb3Vu dGVyLWluY3JlbWVudC10ZXN0cy5odG0JKHJldmlzaW9uIDExNTMzNykKKysrIExheW91dFRlc3Rz L2Zhc3QvY3NzL2NvdW50ZXJzL2NvdW50ZXItaW5jcmVtZW50LXRlc3RzLmh0bQkod29ya2luZyBj b3B5KQpAQCAtNzIsNiArNzIsMTMgQEAKICAgICAgICAgICAgICAgICBzaG91bGRCZSgibGF5b3V0 VGVzdENvbnRyb2xsZXIuY291bnRlclZhbHVlRm9yRWxlbWVudEJ5SWQoJ3Rlc3Q1NCcpIiwgIicx MCciKTsKICAgICAgICAgICAgICAgICBzaG91bGRCZSgibGF5b3V0VGVzdENvbnRyb2xsZXIuY291 bnRlclZhbHVlRm9yRWxlbWVudEJ5SWQoJ3Rlc3Q1NScpIiwgIicxJyIpOwogICAgICAgICAgICAg ICAgIHNob3VsZEJlKCJsYXlvdXRUZXN0Q29udHJvbGxlci5jb3VudGVyVmFsdWVGb3JFbGVtZW50 QnlJZCgndGVzdDU2JykiLCAiJy0yMTQ3NDgzNjQ4JyIpOworICAgICAgICAgICAgICAgIHNob3Vs ZEJlKCJsYXlvdXRUZXN0Q29udHJvbGxlci5jb3VudGVyVmFsdWVGb3JFbGVtZW50QnlJZCgndGVz dDU3JykiLCAiJzUnIik7CisgICAgICAgICAgICAgICAgc2hvdWxkQmUoImxheW91dFRlc3RDb250 cm9sbGVyLmNvdW50ZXJWYWx1ZUZvckVsZW1lbnRCeUlkKCdub25lNTcnKSIsICInNSciKTsKKyAg ICAgICAgICAgICAgICBzaG91bGRCZSgibGF5b3V0VGVzdENvbnRyb2xsZXIuY291bnRlclZhbHVl Rm9yRWxlbWVudEJ5SWQoJ3dyYXBwZXI1OCcpIiwgIic1JyIpOworICAgICAgICAgICAgICAgIHNo b3VsZEJlKCJsYXlvdXRUZXN0Q29udHJvbGxlci5jb3VudGVyVmFsdWVGb3JFbGVtZW50QnlJZCgn dGVzdDU4YScpIiwgIic1LjInIik7CisgICAgICAgICAgICAgICAgc2hvdWxkQmUoImxheW91dFRl c3RDb250cm9sbGVyLmNvdW50ZXJWYWx1ZUZvckVsZW1lbnRCeUlkKCdub25lNTgnKSIsICInNS4y JyIpOworICAgICAgICAgICAgICAgIHNob3VsZEJlKCJsYXlvdXRUZXN0Q29udHJvbGxlci5jb3Vu dGVyVmFsdWVGb3JFbGVtZW50QnlJZCgnbm9uZTU4YScpIiwgIic1LjcnIik7CisgICAgICAgICAg ICAgICAgc2hvdWxkQmUoImxheW91dFRlc3RDb250cm9sbGVyLmNvdW50ZXJWYWx1ZUZvckVsZW1l bnRCeUlkKCd0ZXN0NThiJykiLCAiJzUuMTInIik7CiAgICAgICAgICAgICAgICAgaWYgKHdpbmRv dy5sYXlvdXRUZXN0Q29udHJvbGxlcikKICAgICAgICAgICAgICAgICAgICAgbGF5b3V0VGVzdENv bnRyb2xsZXIubm90aWZ5RG9uZSgpOwogICAgICAgICAgICAgfQpAQCAtNTM3LDcgKzU0NCw2MiBA QAogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIGNvbnRlbnQ6IGNvdW50ZXIoaWRlbnQ1 Nik7CiAgICAgICAgICAgICB9Ci0KKyAgICAgICAgICAgIGRpdi5jbGFzczU3CisgICAgICAgICAg ICB7CisgICAgICAgICAgICAgICAgY291bnRlci1pbmNyZW1lbnQ6IGlkZW50NTcgNTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgICAgICN0ZXN0NTc6YmVmb3JlCisgICAgICAgICAgICB7CisgICAg ICAgICAgICAgICAgY29udGVudDogY291bnRlcihpZGVudDU3KTsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICNub25lNTcKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBjb3VudGVy LWluY3JlbWVudDogbm9uZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgICNub25lNTc6YmVm b3JlCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgY29udGVudDogY291bnRlcihpZGVu dDU3KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGRpdi5jbGFzczU4CisgICAgICAgICAg ICB7CisgICAgICAgICAgICAgICAgY291bnRlci1pbmNyZW1lbnQ6IGlkZW50NTggNTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgICAgICN3cmFwcGVyNTg6YmVmb3JlCisgICAgICAgICAgICB7Cisg ICAgICAgICAgICAgICAgY29udGVudDogY291bnRlcihpZGVudDU4KTsKKyAgICAgICAgICAgIH0K KyAgICAgICAgICAgICN0ZXN0NThhCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgY291 bnRlci1yZXNldDogaWRlbnQ1OCAyOworICAgICAgICAgICAgfQorICAgICAgICAgICAgI3Rlc3Q1 OGE6YmVmb3JlCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgY29udGVudDogY291bnRl cnMoaWRlbnQ1OCwgIi4iKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgICNub25lNTgKKyAg ICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBjb3VudGVyLWluY3JlbWVudDogbm9uZTsKKyAg ICAgICAgICAgIH0KKyAgICAgICAgICAgICNub25lNTg6YmVmb3JlCisgICAgICAgICAgICB7Cisg ICAgICAgICAgICAgICAgY29udGVudDogY291bnRlcnMoaWRlbnQ1OCwgIi4iKTsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgICAgICNub25lNThhCisgICAgICAgICAgICB7CisgICAgICAgICAgICAg ICAgY291bnRlci1pbmNyZW1lbnQ6IGlkZW50NTggNTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg ICAgICNub25lNThhOmJlZm9yZQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGNvbnRl bnQ6IGNvdW50ZXJzKGlkZW50NTgsICIuIik7CisgICAgICAgICAgICB9CisgICAgICAgICAgICAj dGVzdDU4YgorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGNvdW50ZXItaW5jcmVtZW50 OiBpZGVudDU4IDU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICAjdGVzdDU4YjpiZWZvcmUK KyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBjb250ZW50OiBjb3VudGVycyhpZGVudDU4 LCAiLiIpOworICAgICAgICAgICAgfQogICAgICAgICA8L3N0eWxlPgogICAgIDwvaGVhZD4KICAg ICA8Ym9keSBvbmxvYWQ9InNldFRpbWVvdXQoJ3J1bigpJywgMCk7Ij4KQEAgLTU5NCwxMCArNjU2 LDE5IEBACiAgICAgICAgIDxkaXYgaWQ9InRlc3Q1MyI+PC9kaXY+CiAgICAgICAgIDxkaXYgaWQ9 Im5vbmU1MyI+PC9kaXY+CiAgICAgICAgIDxkaXYgaWQ9InRlc3Q1M2EiPjwvZGl2PgotICAgICAg ICA8ZGl2IGlkPSJ3cmFwcGVyNTQiPiAKKyAgICAgICAgPGRpdiBpZD0id3JhcHBlcjU0Ij4KICAg ICAgICAgICAgIDxkaXYgaWQ9InRlc3Q1NCI+PC9kaXY+CiAgICAgICAgIDwvZGl2PgogICAgICAg ICA8ZGl2IGlkPSJ0ZXN0NTUiPjwvZGl2PgogICAgICAgICA8ZGl2IGlkPSJ0ZXN0NTYiPjwvZGl2 PgorICAgICAgICA8ZGl2IGlkPSJ0ZXN0NTciIGNsYXNzPSJjbGFzczU3Ij48L2Rpdj4KKyAgICAg ICAgPGRpdiBpZD0ibm9uZTU3IiBjbGFzcz0iY2xhc3M1NyI+PC9kaXY+CisgICAgICAgIDxkaXYg aWQ9IndyYXBwZXI1OCIgY2xhc3M9ImNsYXNzNTgiPgorICAgICAgICAgICAgPHNwYW4gaWQ9InRl c3Q1OGEiPjwvc3Bhbj4KKyAgICAgICAgICAgIDxzcGFuIGlkPSJub25lNTgiPgorICAgICAgICAg ICAgICAgIDxzcGFuIGlkPSJub25lNThhIj48L3NwYW4+CisgICAgICAgICAgICA8L3NwYW4+Cisg ICAgICAgICAgICA8c3BhbiBpZD0idGVzdDU4YiI+PC9zcGFuPgorICAgICAgICA8L2Rpdj4KICAg ICA8L2JvZHk+CiA8L2h0bWw+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQo= 194371 2013-03-21 16:09:24 -0700 2013-04-08 10:39:37 -0700 clear counter increment when its value is none 84985.patch text/plain 7678 max.hong.shen ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmNTdjMDVmLi45OTU5NDIxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMDMt MjEgIFlpIFNoZW4gIDxtYXguaG9uZy5zaGVuQGdtYWlsLmNvbT4KKworICAgICAgICBDb3VudGVy IHN0aWxsIGdldHMgaW5jcmVtZW50ZWQgd2hlbiBjb3VudGVyLWluY3JlbWVudCBpcyBzZXQgdG8g bm9uZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ5 ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVu IHRoZSBjb3VudGVyLWluY3JlbWVudCBpcyBzZXQgdG8gbm9uZSwgbm8gY291bnRlcnMgYXJlIGlu Y3JlbWVudGVkLgorCisgICAgICAgICogZmFzdC9jc3MvY291bnRlcnMvY291bnRlci1pbmNyZW1l bnQtdGVzdHMtZXhwZWN0ZWQudHh0OiBBZGRlZCBuZXcgdGVzdCBjYXNlcy4KKyAgICAgICAgKiBm YXN0L2Nzcy9jb3VudGVycy9jb3VudGVyLWluY3JlbWVudC10ZXN0cy5odG06IEFkZGVkIG5ldyB0 ZXN0IGNhc2VzLgorCiAyMDEzLTAzLTIxICBKdWxpZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3 ZWJraXQub3JnPgogCiAgICAgICAgIFtDU1MgR3JpZCBMYXlvdXRdIFByb3Blcmx5IGxheW91dCBz cGFubmluZyBncmlkIGl0ZW1zIHdpdGggbWlubWF4IGdyaWQgdHJhY2tzCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L2Nzcy9jb3VudGVycy9jb3VudGVyLWluY3JlbWVudC10ZXN0cy1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9jb3VudGVycy9jb3VudGVyLWluY3JlbWVu dC10ZXN0cy1leHBlY3RlZC50eHQKaW5kZXggNWJhYzgxMi4uOTViYWFkNSAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvZmFzdC9jc3MvY291bnRlcnMvY291bnRlci1pbmNyZW1lbnQtdGVzdHMtZXhw ZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2NvdW50ZXJzL2NvdW50ZXItaW5j cmVtZW50LXRlc3RzLWV4cGVjdGVkLnR4dApAQCAtNTUsNCArNTUsMTEgQEAgUEFTUyB3aW5kb3cu aW50ZXJuYWxzLmNvdW50ZXJWYWx1ZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnd3JhcHBlcjU0 JykpIGlzICc1JwogUEFTUyB3aW5kb3cuaW50ZXJuYWxzLmNvdW50ZXJWYWx1ZShkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgndGVzdDU0JykpIGlzICcxMCcKIFBBU1Mgd2luZG93LmludGVybmFscy5j b3VudGVyVmFsdWUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3Q1NScpKSBpcyAnMScKIFBB U1Mgd2luZG93LmludGVybmFscy5jb3VudGVyVmFsdWUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo J3Rlc3Q1NicpKSBpcyAnLTIxNDc0ODM2NDgnCi0KK1BBU1Mgd2luZG93LmludGVybmFscy5jb3Vu dGVyVmFsdWUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3Q1NycpKSBpcyAnNScKK1BBU1Mg d2luZG93LmludGVybmFscy5jb3VudGVyVmFsdWUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ25v bmU1NycpKSBpcyAnNScKK1BBU1Mgd2luZG93LmludGVybmFscy5jb3VudGVyVmFsdWUoZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoJ3dyYXBwZXI1OCcpKSBpcyAnNScKK1BBU1Mgd2luZG93LmludGVy bmFscy5jb3VudGVyVmFsdWUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3Q1OGEnKSkgaXMg JzUuMicKK1BBU1Mgd2luZG93LmludGVybmFscy5jb3VudGVyVmFsdWUoZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoJ25vbmU1OCcpKSBpcyAnNS4yJworUEFTUyB3aW5kb3cuaW50ZXJuYWxzLmNvdW50 ZXJWYWx1ZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnbm9uZTU4YScpKSBpcyAnNS43JworUEFT UyB3aW5kb3cuaW50ZXJuYWxzLmNvdW50ZXJWYWx1ZShkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgn dGVzdDU4YicpKSBpcyAnNS4xMicKKyAgICAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qv Y3NzL2NvdW50ZXJzL2NvdW50ZXItaW5jcmVtZW50LXRlc3RzLmh0bSBiL0xheW91dFRlc3RzL2Zh c3QvY3NzL2NvdW50ZXJzL2NvdW50ZXItaW5jcmVtZW50LXRlc3RzLmh0bQppbmRleCBiNGZjMjE3 Li5jMDVjNmQ2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9jb3VudGVycy9jb3Vu dGVyLWluY3JlbWVudC10ZXN0cy5odG0KKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvY291bnRl cnMvY291bnRlci1pbmNyZW1lbnQtdGVzdHMuaHRtCkBAIC03Miw2ICs3MiwxMyBAQAogICAgICAg ICAgICAgICAgIHNob3VsZEJlKCJ3aW5kb3cuaW50ZXJuYWxzLmNvdW50ZXJWYWx1ZShkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgndGVzdDU0JykpIiwgIicxMCciKTsKICAgICAgICAgICAgICAgICBz aG91bGRCZSgid2luZG93LmludGVybmFscy5jb3VudGVyVmFsdWUoZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoJ3Rlc3Q1NScpKSIsICInMSciKTsKICAgICAgICAgICAgICAgICBzaG91bGRCZSgid2lu ZG93LmludGVybmFscy5jb3VudGVyVmFsdWUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3Q1 NicpKSIsICInLTIxNDc0ODM2NDgnIik7CisgICAgICAgICAgICAgICAgc2hvdWxkQmUoIndpbmRv dy5pbnRlcm5hbHMuY291bnRlclZhbHVlKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0NTcn KSkiLCAiJzUnIik7CisgICAgICAgICAgICAgICAgc2hvdWxkQmUoIndpbmRvdy5pbnRlcm5hbHMu Y291bnRlclZhbHVlKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdub25lNTcnKSkiLCAiJzUnIik7 CisgICAgICAgICAgICAgICAgc2hvdWxkQmUoIndpbmRvdy5pbnRlcm5hbHMuY291bnRlclZhbHVl KGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd3cmFwcGVyNTgnKSkiLCAiJzUnIik7CisgICAgICAg ICAgICAgICAgc2hvdWxkQmUoIndpbmRvdy5pbnRlcm5hbHMuY291bnRlclZhbHVlKGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCd0ZXN0NThhJykpIiwgIic1LjInIik7CisgICAgICAgICAgICAgICAg c2hvdWxkQmUoIndpbmRvdy5pbnRlcm5hbHMuY291bnRlclZhbHVlKGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCdub25lNTgnKSkiLCAiJzUuMiciKTsKKyAgICAgICAgICAgICAgICBzaG91bGRCZSgi d2luZG93LmludGVybmFscy5jb3VudGVyVmFsdWUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ25v bmU1OGEnKSkiLCAiJzUuNyciKTsKKyAgICAgICAgICAgICAgICBzaG91bGRCZSgid2luZG93Lmlu dGVybmFscy5jb3VudGVyVmFsdWUoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3Q1OGInKSki LCAiJzUuMTInIik7CiAgICAgICAgICAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQogICAg ICAgICAgICAgICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKICAgICAgICAgICAgIH0K QEAgLTUzNyw3ICs1NDQsNjIgQEAKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICBjb250 ZW50OiBjb3VudGVyKGlkZW50NTYpOwogICAgICAgICAgICAgfQotCisgICAgICAgICAgICBkaXYu Y2xhc3M1NworICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGNvdW50ZXItaW5jcmVtZW50 OiBpZGVudDU3IDU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICAjdGVzdDU3OmJlZm9yZQor ICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGNvbnRlbnQ6IGNvdW50ZXIoaWRlbnQ1Nyk7 CisgICAgICAgICAgICB9CisgICAgICAgICAgICAjbm9uZTU3CisgICAgICAgICAgICB7CisgICAg ICAgICAgICAgICAgY291bnRlci1pbmNyZW1lbnQ6IG5vbmU7CisgICAgICAgICAgICB9CisgICAg ICAgICAgICAjbm9uZTU3OmJlZm9yZQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGNv bnRlbnQ6IGNvdW50ZXIoaWRlbnQ1Nyk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBkaXYu Y2xhc3M1OAorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGNvdW50ZXItaW5jcmVtZW50 OiBpZGVudDU4IDU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICAjd3JhcHBlcjU4OmJlZm9y ZQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGNvbnRlbnQ6IGNvdW50ZXIoaWRlbnQ1 OCk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICAjdGVzdDU4YQorICAgICAgICAgICAgewor ICAgICAgICAgICAgICAgIGNvdW50ZXItcmVzZXQ6IGlkZW50NTggMjsKKyAgICAgICAgICAgIH0K KyAgICAgICAgICAgICN0ZXN0NThhOmJlZm9yZQorICAgICAgICAgICAgeworICAgICAgICAgICAg ICAgIGNvbnRlbnQ6IGNvdW50ZXJzKGlkZW50NTgsICIuIik7CisgICAgICAgICAgICB9CisgICAg ICAgICAgICAjbm9uZTU4CisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgY291bnRlci1p bmNyZW1lbnQ6IG5vbmU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICAjbm9uZTU4OmJlZm9y ZQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGNvbnRlbnQ6IGNvdW50ZXJzKGlkZW50 NTgsICIuIik7CisgICAgICAgICAgICB9CisgICAgICAgICAgICAjbm9uZTU4YQorICAgICAgICAg ICAgeworICAgICAgICAgICAgICAgIGNvdW50ZXItaW5jcmVtZW50OiBpZGVudDU4IDU7CisgICAg ICAgICAgICB9CisgICAgICAgICAgICAjbm9uZTU4YTpiZWZvcmUKKyAgICAgICAgICAgIHsKKyAg ICAgICAgICAgICAgICBjb250ZW50OiBjb3VudGVycyhpZGVudDU4LCAiLiIpOworICAgICAgICAg ICAgfQorICAgICAgICAgICAgI3Rlc3Q1OGIKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAg ICBjb3VudGVyLWluY3JlbWVudDogaWRlbnQ1OCA1OworICAgICAgICAgICAgfQorICAgICAgICAg ICAgI3Rlc3Q1OGI6YmVmb3JlCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgY29udGVu dDogY291bnRlcnMoaWRlbnQ1OCwgIi4iKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgPC9zdHls ZT4KICAgICA8L2hlYWQ+CiAgICAgPGJvZHkgb25sb2FkPSJzZXRUaW1lb3V0KCdydW4oKScsIDAp OyI+CkBAIC01OTksNSArNjYxLDE0IEBACiAgICAgICAgIDwvZGl2PgogICAgICAgICA8ZGl2IGlk PSJ0ZXN0NTUiPjwvZGl2PgogICAgICAgICA8ZGl2IGlkPSJ0ZXN0NTYiPjwvZGl2PgorICAgICAg ICA8ZGl2IGlkPSJ0ZXN0NTciIGNsYXNzPSJjbGFzczU3Ij48L2Rpdj4KKyAgICAgICAgPGRpdiBp ZD0ibm9uZTU3IiBjbGFzcz0iY2xhc3M1NyI+PC9kaXY+CisgICAgICAgIDxkaXYgaWQ9IndyYXBw ZXI1OCIgY2xhc3M9ImNsYXNzNTgiPgorICAgICAgICAgICAgPHNwYW4gaWQ9InRlc3Q1OGEiPjwv c3Bhbj4KKyAgICAgICAgICAgIDxzcGFuIGlkPSJub25lNTgiPgorICAgICAgICAgICAgICAgIDxz cGFuIGlkPSJub25lNThhIj48L3NwYW4+CisgICAgICAgICAgICA8L3NwYW4+CisgICAgICAgICAg ICA8c3BhbiBpZD0idGVzdDU4YiI+PC9zcGFuPgorICAgICAgICA8L2Rpdj4KICAgICA8L2JvZHk+ CiA8L2h0bWw+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGQzYTZh YzQuLjY2OTg1OTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMy0wMy0yMSAgWWkg U2hlbiAgPG1heC5ob25nLnNoZW5AZ21haWwuY29tPgorCisgICAgICAgIENvdW50ZXIgc3RpbGwg Z2V0cyBpbmNyZW1lbnRlZCB3aGVuIGNvdW50ZXItaW5jcmVtZW50IGlzIHNldCB0byBub25lCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDk4NQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gdGhlIGNv dW50ZXItaW5jcmVtZW50IGlzIHNldCB0byBub25lLCBubyBjb3VudGVycyBhcmUgaW5jcmVtZW50 ZWQuCisKKyAgICAgICAgVGVzdHM6IE5ldyB0ZXN0IGNhc2VzIGFkZGVkIGluIGZhc3QvY3NzL2Nv dW50ZXJzL2NvdW50ZXItaW5jcmVtZW50LXRlc3RzLmh0bQorCisgICAgICAgICogY3NzL1N0eWxl QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5Q291bnRlcjo6YXBw bHlWYWx1ZSk6CisKIDIwMTMtMDMtMjEgIEp1bGllbiBDaGFmZnJhaXggIDxqY2hhZmZyYWl4QHdl YmtpdC5vcmc+CiAKICAgICAgICAgW0NTUyBHcmlkIExheW91dF0gUHJvcGVybHkgbGF5b3V0IHNw YW5uaW5nIGdyaWQgaXRlbXMgd2l0aCBtaW5tYXggZ3JpZCB0cmFja3MKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlQnVpbGRlci5jcHAKaW5kZXggZDJiNDc2NC4uODgxMDM5MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlQnVpbGRlci5jcHAKQEAgLTExMzYsMTAgKzExMzYsMTAgQEAgcHVibGljOgogICAgIH0KICAg ICBzdGF0aWMgdm9pZCBhcHBseVZhbHVlKENTU1Byb3BlcnR5SUQsIFN0eWxlUmVzb2x2ZXIqIHN0 eWxlUmVzb2x2ZXIsIENTU1ZhbHVlKiB2YWx1ZSkKICAgICB7Ci0gICAgICAgIGlmICghdmFsdWUt PmlzVmFsdWVMaXN0KCkpCi0gICAgICAgICAgICByZXR1cm47CisgICAgICAgIGJvb2wgc2V0Q291 bnRlckluY3JlbWVudFRvTm9uZSA9IGNvdW50ZXJCZWhhdmlvciA9PSBJbmNyZW1lbnQgJiYgdmFs dWUtPmlzUHJpbWl0aXZlVmFsdWUoKSAmJiBzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVWYWx1ZSo+ KHZhbHVlKS0+Z2V0SWRlbnQoKSA9PSBDU1NWYWx1ZU5vbmU7CiAKLSAgICAgICAgQ1NTVmFsdWVM aXN0KiBsaXN0ID0gc3RhdGljX2Nhc3Q8Q1NTVmFsdWVMaXN0Kj4odmFsdWUpOworICAgICAgICBp ZiAoIXZhbHVlLT5pc1ZhbHVlTGlzdCgpICYmICFzZXRDb3VudGVySW5jcmVtZW50VG9Ob25lKQor ICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIENvdW50ZXJEaXJlY3RpdmVNYXAmIG1hcCA9 IHN0eWxlUmVzb2x2ZXItPnN0eWxlKCktPmFjY2Vzc0NvdW50ZXJEaXJlY3RpdmVzKCk7CiAgICAg ICAgIHR5cGVkZWYgQ291bnRlckRpcmVjdGl2ZU1hcDo6aXRlcmF0b3IgSXRlcmF0b3I7CkBAIC0x MTUwLDcgKzExNTAsMTEgQEAgcHVibGljOgogICAgICAgICAgICAgICAgIGl0LT52YWx1ZS5jbGVh clJlc2V0KCk7CiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgaXQtPnZhbHVlLmNs ZWFySW5jcmVtZW50KCk7Ci0KKyAgICAgICAgCisgICAgICAgIGlmIChzZXRDb3VudGVySW5jcmVt ZW50VG9Ob25lKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAKKyAgICAgICAgQ1NTVmFs dWVMaXN0KiBsaXN0ID0gc3RhdGljX2Nhc3Q8Q1NTVmFsdWVMaXN0Kj4odmFsdWUpOwogICAgICAg ICBpbnQgbGVuZ3RoID0gbGlzdCA/IGxpc3QtPmxlbmd0aCgpIDogMDsKICAgICAgICAgZm9yIChp bnQgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkgewogICAgICAgICAgICAgQ1NTVmFsdWUqIGN1cnJW YWx1ZSA9IGxpc3QtPml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soaSk7Cg==