Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

counter-reset defaults to 0, not 1. #8321

Merged
merged 2 commits into from Nov 4, 2015
Merged

counter-reset defaults to 0, not 1. #8321

merged 2 commits into from Nov 4, 2015
+12 −19

Conversation

@SimonSapin
Copy link
Member

SimonSapin commented Nov 3, 2015

https://drafts.csswg.org/css2/generate.html#counters

Review on Reviewable
@pcwalton
Copy link
Contributor

pcwalton commented Nov 3, 2015

Can you reftest this?
@SimonSapin
Copy link
Member Author

SimonSapin commented Nov 3, 2015

@bors-servo try

Let’s see if it fixes existing tests. If not I’ll add some.
@bors-servo
Copy link
Contributor

bors-servo commented Nov 3, 2015

⌛ Trying commit 3942d6c with merge cab8ed9...
bors-servo added a commit that referenced this pull request Nov 3, 2015
@bors-servo
Auto merge of #8321 - servo:reset-zero, r=<try>
cab8ed9 
counter-reset defaults to 0, not 1.

https://drafts.csswg.org/css2/generate.html#counters

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8321)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 3, 2015

💔 Test failed - linux-rel
@dzbarsky
Copy link
Member

dzbarsky commented Nov 4, 2015

▶ PASS [expected FAIL] /css21_dev/html4/counters-001.htm

▶ PASS [expected FAIL] /css21_dev/html4/counters-004.htm

▶ PASS [expected FAIL] /css21_dev/html4/counters-008.htm

▶ PASS [expected FAIL] /css21_dev/html4/counters-006.htm

▶ Unexpected subtest result in /_mozilla/css/test_variable_serialization_computed.html:

└ PASS [expected FAIL] subtest #23 with counter-reset: var(--a)red; --a:orange;

▶ TIMEOUT [expected PASS] /_mozilla/css/canvas_over_area.html
@SimonSapin
Counter names serialize as identifiers, not strings.
75bc88b
@SimonSapin SimonSapin force-pushed the reset-zero branch from 3942d6c to 657e4f4 Nov 4, 2015
@highfive highfive removed the S-tests-failed label Nov 4, 2015
@SimonSapin
counter-reset defaults to 0, not 1.
Loading status checks…
80dbd29
@Ms2ger
Copy link
Contributor

Ms2ger commented Nov 4, 2015

Reviewed 1 of 1 files at r1, 6 of 6 files at r2.
Review status: all files reviewed at latest revision, 1 unresolved discussion.

components/style/properties.mako.rs, line 1341 [r2] (raw file):
Does this need to be a pub use?

Comments from the review on Reviewable.io
@SimonSapin SimonSapin force-pushed the reset-zero branch from 657e4f4 to 80dbd29 Nov 4, 2015
@SimonSapin
Copy link
Member Author

SimonSapin commented Nov 4, 2015

Review status: 5 of 6 files reviewed at latest revision, 1 unresolved discussion.

components/style/properties.mako.rs, line 1341 [r2] (raw file):
It doesn’t. Fixed.

Comments from the review on Reviewable.io
@Ms2ger
Copy link
Contributor

Ms2ger commented Nov 4, 2015

@bors-servo r+

Thanks!

Reviewed 1 of 1 files at r3.
Review status: all files reviewed at latest revision, all discussions resolved.

Comments from the review on Reviewable.io
@bors-servo
Copy link
Contributor

bors-servo commented Nov 4, 2015

📌 Commit 80dbd29 has been approved by Ms2ger
@bors-servo
Copy link
Contributor

bors-servo commented Nov 4, 2015

⌛ Testing commit 80dbd29 with merge 9dbf9c6...
bors-servo added a commit that referenced this pull request Nov 4, 2015
@bors-servo
Auto merge of #8321 - servo:reset-zero, r=Ms2ger
9dbf9c6 
counter-reset defaults to 0, not 1.

https://drafts.csswg.org/css2/generate.html#counters

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8321)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 4, 2015

💔 Test failed - mac-rel-wpt
@SimonSapin
Copy link
Member Author

SimonSapin commented Nov 4, 2015

@bors-servo retry

#7787
@bors-servo
Copy link
Contributor

bors-servo commented Nov 4, 2015

⌛ Testing commit 80dbd29 with merge df4e614...
bors-servo added a commit that referenced this pull request Nov 4, 2015
@bors-servo
Auto merge of #8321 - servo:reset-zero, r=Ms2ger
Loading status checks…
df4e614 
counter-reset defaults to 0, not 1.

https://drafts.csswg.org/css2/generate.html#counters

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8321)
<!-- Reviewable:end -->
@highfive highfive removed the S-tests-failed label Nov 4, 2015
@bors-servo
Copy link
Contributor

bors-servo commented Nov 4, 2015

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-ref-unit, mac-rel-css, mac-rel-wpt
@bors-servo bors-servo merged commit 80dbd29 into master Nov 4, 2015
3 checks passed
3 checks passed
code-review/reviewable Review complete: all files reviewed, all discussions resolved
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@SimonSapin SimonSapin deleted the reset-zero branch Nov 4, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pcwalton pcwalton

Labels
S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@SimonSapin @pcwalton @bors-servo @dzbarsky @Ms2ger @highfive
You can’t perform that action at this time.