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

moved css longhand counter-reset out of mako

Browse source
This commit is contained in:
Jonas Reinwald 2017-12-08 19:08:22 +01:00 • committed by Emilio Cobos Álvarez
parent dcd13b857c
commit d24301b7a0
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
11 changed files with 240 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/layout/flow.rs
View file

@ -1035,8 +1035,8 @@ impl BaseFlow {
}
}
if !style.get_counters().counter_reset.0.is_empty() ||
!style.get_counters().counter_increment.0.is_empty() {
if !style.get_counters().counter_reset.get_values().is_empty() ||
!style.get_counters().counter_increment.get_values().is_empty() {
flags.insert(FlowFlags::AFFECTS_COUNTERS)
}
}

4
components/layout/generated_content.rs
View file

@ -272,7 +272,7 @@ impl<'a, 'b> ResolveGeneratedContentFragmentMutator<'a, 'b> {
}
self.traversal.list_item.truncate_to_level(self.level);
for &(ref counter_name, value) in &fragment.style().get_counters().counter_reset.0 {
for &(ref counter_name, value) in fragment.style().get_counters().counter_reset.get_values() {
let counter_name = &*counter_name.0;
if let Some(ref mut counter) = self.traversal.counters.get_mut(counter_name) {
counter.reset(self.level, value);
@ -284,7 +284,7 @@ impl<'a, 'b> ResolveGeneratedContentFragmentMutator<'a, 'b> {
self.traversal.counters.insert(counter_name.to_owned(), counter);
}
for &(ref counter_name, value) in &fragment.style().get_counters().counter_increment.0 {
for &(ref counter_name, value) in fragment.style().get_counters().counter_increment.get_values() {
let counter_name = &*counter_name.0;
if let Some(ref mut counter) = self.traversal.counters.get_mut(counter_name) {
counter.increment(self.level, value);