Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-10-01 00:59:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #20171 - servo:content-item-counters, r=emilio

Browse source 
Make ContentItem use a CustomIdent for counter names

See https://github.com/w3c/csswg-drafts/pull/2377.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20171)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-03-02 11:18:49 -05:00 • committed by GitHub
commit 476a0764f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 76 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/layout/generated_content.rs
View file

@ -188,9 +188,9 @@ impl<'a, 'b> ResolveGeneratedContentFragmentMutator<'a, 'b> {
counter_style)) => {
let temporary_counter = Counter::new();
let counter = self.traversal
.counters
.get(&**counter_name)
.unwrap_or(&temporary_counter);
.counters
.get(&*counter_name.0)
.unwrap_or(&temporary_counter);
new_info = counter.render(self.traversal.layout_context,
fragment.node,
fragment.pseudo.clone(),
@ -203,9 +203,9 @@ impl<'a, 'b> ResolveGeneratedContentFragmentMutator<'a, 'b> {
counter_style)) => {
let temporary_counter = Counter::new();
let counter = self.traversal
.counters
.get(&**counter_name)
.unwrap_or(&temporary_counter);
.counters
.get(&*counter_name.0)
.unwrap_or(&temporary_counter);
new_info = counter.render(self.traversal.layout_context,
fragment.node,
fragment.pseudo,