Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move CSS content property from Box to Counters

Browse source
This commit is contained in:
Mauricio Collares 2016-04-04 23:11:04 -03:00
parent 8c8090b5cd
commit 841aef06e0
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/layout/incremental.rs
View file

@ -176,7 +176,7 @@ pub fn compute_damage(old: Option<&Arc<ServoComputedValues>>, new: &ServoCompute
REFLOW, REFLOW,
RECONSTRUCT_FLOW RECONSTRUCT_FLOW
], [ ], [
get_box.float, get_box.display, get_box.position, get_box.content, get_box.float, get_box.display, get_box.position, get_counters.content,
get_counters.counter_reset, get_counters.counter_increment, get_counters.counter_reset, get_counters.counter_increment,
get_list.quotes, get_list.list_style_type, get_list.quotes, get_list.list_style_type,

2
components/layout/wrapper.rs
View file

@ -1034,7 +1034,7 @@ impl<'ln> ThreadSafeLayoutNode for ServoThreadSafeLayoutNode<'ln> {
data.per_pseudo.get(&PseudoElement::After).unwrap() data.per_pseudo.get(&PseudoElement::After).unwrap()
}; };
return match style.as_ref().get_box().content { return match style.as_ref().get_counters().content {
content::T::Content(ref value) if !value.is_empty() => { content::T::Content(ref value) if !value.is_empty() => {
TextContent::GeneratedContent((*value).clone()) TextContent::GeneratedContent((*value).clone())
} }

4
components/style/properties.mako.rs
View file

@ -904,7 +904,7 @@ pub mod longhands {
// CSS 2.1, Section 12 - Generated content, automatic numbering, and lists // CSS 2.1, Section 12 - Generated content, automatic numbering, and lists
${switch_to_style_struct("Box")} ${new_style_struct("Counters", is_inherited=False)}
<%self:longhand name="content"> <%self:longhand name="content">
use cssparser::Token; use cssparser::Token;
@ -1217,7 +1217,7 @@ pub mod longhands {
} }
</%self:longhand> </%self:longhand>
${new_style_struct("Counters", is_inherited=False)} ${switch_to_style_struct("Counters")}
<%self:longhand name="counter-increment"> <%self:longhand name="counter-increment">
use std::fmt; use std::fmt;