Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-18 22:34:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use SmallBitVec for important flags in PDB

Browse source
This commit is contained in:
Matt Brubeck 2017-09-08 21:52:48 -07:00
parent 21006fb752
commit a5a0e9ffe8
7 changed files with 129 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/dom/cssstyledeclaration.rs
View file

@ -410,10 +410,10 @@ impl CSSStyleDeclarationMethods for CSSStyleDeclaration {
// https://dev.w3.org/csswg/cssom/#the-cssstyledeclaration-interface // https://dev.w3.org/csswg/cssom/#the-cssstyledeclaration-interface
fn IndexedGetter(&self, index: u32) -> Option<DOMString> { fn IndexedGetter(&self, index: u32) -> Option<DOMString> {
self.owner.with_block(|pdb| { self.owner.with_block(|pdb| {
pdb.declarations().get(index as usize).map(|entry| { pdb.declarations().get(index as usize).map(|declaration| {
let (ref declaration, importance) = *entry; let important = pdb.declarations_importance().get(index);
let mut css = declaration.to_css_string(); let mut css = declaration.to_css_string();
if importance.important() { if important {
css += " !important"; css += " !important";
} }
DOMString::from(css) DOMString::from(css)

7
components/style/animation.rs
View file

@ -10,7 +10,7 @@ use bezier::Bezier;
use context::SharedStyleContext; use context::SharedStyleContext;
use dom::OpaqueNode; use dom::OpaqueNode;
use font_metrics::FontMetricsProvider; use font_metrics::FontMetricsProvider;
use properties::{self, CascadeFlags, ComputedValues, Importance}; use properties::{self, CascadeFlags, ComputedValues};
use properties::animated_properties::{AnimatableLonghand, AnimatedProperty, TransitionProperty}; use properties::animated_properties::{AnimatableLonghand, AnimatedProperty, TransitionProperty};
use properties::longhands::animation_direction::computed_value::single_value::T as AnimationDirection; use properties::longhands::animation_direction::computed_value::single_value::T as AnimationDirection;
use properties::longhands::animation_iteration_count::single_value::computed_value::T as AnimationIterationCount; use properties::longhands::animation_iteration_count::single_value::computed_value::T as AnimationIterationCount;
@ -484,12 +484,11 @@ fn compute_style_for_animation_step(context: &SharedStyleContext,
let guard = declarations.read_with(context.guards.author); let guard = declarations.read_with(context.guards.author);
// No !important in keyframes. // No !important in keyframes.
debug_assert!(guard.declarations().iter() debug_assert!(!guard.any_important());
.all(|&(_, importance)| importance == Importance::Normal));
let iter = || { let iter = || {
guard.declarations().iter().rev() guard.declarations().iter().rev()
.map(|&(ref decl, _importance)| (decl, CascadeLevel::Animations)) .map(|decl| (decl, CascadeLevel::Animations))
}; };
// This currently ignores visited styles, which seems acceptable, // This currently ignores visited styles, which seems acceptable,

189
components/style/properties/declaration_block.rs
View file

@ -14,8 +14,10 @@ use parser::{ParserContext, ParserErrorContext};
use properties::animated_properties::AnimationValue; use properties::animated_properties::AnimationValue;
use selectors::parser::SelectorParseError; use selectors::parser::SelectorParseError;
use shared_lock::Locked; use shared_lock::Locked;
use smallbitvec::{self, SmallBitVec};
use smallvec::SmallVec; use smallvec::SmallVec;
use std::fmt; use std::fmt;
use std::iter::{DoubleEndedIterator, Zip};
use std::slice::Iter; use std::slice::Iter;
use style_traits::{PARSING_MODE_DEFAULT, ToCss, ParseError, ParsingMode, StyleParseError}; use style_traits::{PARSING_MODE_DEFAULT, ToCss, ParseError, ParsingMode, StyleParseError};
use stylesheets::{CssRuleType, Origin, UrlExtraData}; use stylesheets::{CssRuleType, Origin, UrlExtraData};
@ -73,10 +75,10 @@ pub struct PropertyDeclarationBlock {
/// The group of declarations, along with their importance. /// The group of declarations, along with their importance.
/// ///
/// Only deduplicated declarations appear here. /// Only deduplicated declarations appear here.
declarations: Vec<(PropertyDeclaration, Importance)>, declarations: Vec<PropertyDeclaration>,
/// The number of entries in `self.declaration` with `Importance::Important` /// The "important" flag for each declaration in `declarations`.
important_count: usize, declarations_importance: SmallBitVec,
longhands: LonghandIdSet, longhands: LonghandIdSet,
} }
@ -87,23 +89,39 @@ impl MallocSizeOf for PropertyDeclarationBlock {
} }
} }
/// Iterator for PropertyDeclaration to be generated from PropertyDeclarationBlock. /// Iterator over `(PropertyDeclaration, Importance)` pairs.
#[derive(Clone)] pub struct DeclarationImportanceIterator<'a> {
pub struct PropertyDeclarationIterator<'a> { iter: Zip<Iter<'a, PropertyDeclaration>, smallbitvec::Iter<'a>>,
iter: Iter<'a, (PropertyDeclaration, Importance)>,
} }
impl<'a> Iterator for PropertyDeclarationIterator<'a> { impl<'a> DeclarationImportanceIterator<'a> {
type Item = &'a PropertyDeclaration; /// Constructor
#[inline] pub fn new(declarations: &'a [PropertyDeclaration], important: &'a SmallBitVec) -> Self {
fn next(&mut self) -> Option<&'a PropertyDeclaration> { DeclarationImportanceIterator {
self.iter.next().map(|&(ref decl, _)| decl) iter: declarations.iter().zip(important.iter()),
}
}
}
impl<'a> Iterator for DeclarationImportanceIterator<'a> {
type Item = (&'a PropertyDeclaration, Importance);
fn next(&mut self) -> Option<Self::Item> {
self.iter.next().map(|(decl, important)|
(decl, if important { Importance::Important } else { Importance::Normal }))
}
}
impl<'a> DoubleEndedIterator for DeclarationImportanceIterator<'a> {
fn next_back(&mut self) -> Option<Self::Item> {
self.iter.next_back().map(|(decl, important)|
(decl, if important { Importance::Important } else { Importance::Normal }))
} }
} }
/// Iterator for AnimationValue to be generated from PropertyDeclarationBlock. /// Iterator for AnimationValue to be generated from PropertyDeclarationBlock.
pub struct AnimationValueIterator<'a, 'cx, 'cx_a:'cx> { pub struct AnimationValueIterator<'a, 'cx, 'cx_a:'cx> {
iter: Iter<'a, (PropertyDeclaration, Importance)>, iter: DeclarationImportanceIterator<'a>,
context: &'cx mut Context<'cx_a>, context: &'cx mut Context<'cx_a>,
default_values: &'a ComputedValues, default_values: &'a ComputedValues,
} }
@ -113,7 +131,7 @@ impl<'a, 'cx, 'cx_a:'cx> AnimationValueIterator<'a, 'cx, 'cx_a> {
context: &'cx mut Context<'cx_a>, context: &'cx mut Context<'cx_a>,
default_values: &'a ComputedValues) -> AnimationValueIterator<'a, 'cx, 'cx_a> { default_values: &'a ComputedValues) -> AnimationValueIterator<'a, 'cx, 'cx_a> {
AnimationValueIterator { AnimationValueIterator {
iter: declarations.declarations().iter(), iter: declarations.declaration_importance_iter(),
context: context, context: context,
default_values: default_values, default_values: default_values,
} }
@ -124,12 +142,10 @@ impl<'a, 'cx, 'cx_a:'cx> Iterator for AnimationValueIterator<'a, 'cx, 'cx_a> {
type Item = (AnimatableLonghand, AnimationValue); type Item = (AnimatableLonghand, AnimationValue);
#[inline] #[inline]
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
use properties::Importance;
loop { loop {
let next = self.iter.next(); let next = self.iter.next();
match next { match next {
Some(&(ref decl, importance)) => { Some((decl, importance)) => {
if importance == Importance::Normal { if importance == Importance::Normal {
let property = AnimatableLonghand::from_declaration(decl); let property = AnimatableLonghand::from_declaration(decl);
let animation = AnimationValue::from_declaration(decl, &mut self.context, let animation = AnimationValue::from_declaration(decl, &mut self.context,
@ -166,7 +182,7 @@ impl PropertyDeclarationBlock {
pub fn new() -> Self { pub fn new() -> Self {
PropertyDeclarationBlock { PropertyDeclarationBlock {
declarations: Vec::new(), declarations: Vec::new(),
important_count: 0, declarations_importance: SmallBitVec::new(),
longhands: LonghandIdSet::new(), longhands: LonghandIdSet::new(),
} }
} }
@ -178,22 +194,25 @@ impl PropertyDeclarationBlock {
longhands.insert(id); longhands.insert(id);
} }
PropertyDeclarationBlock { PropertyDeclarationBlock {
declarations: vec![(declaration, importance)], declarations: vec![declaration],
important_count: if importance.important() { 1 } else { 0 }, declarations_importance: SmallBitVec::from_elem(1, importance.important()),
longhands: longhands, longhands: longhands,
} }
} }
/// The declarations in this block /// The declarations in this block
pub fn declarations(&self) -> &[(PropertyDeclaration, Importance)] { pub fn declarations(&self) -> &[PropertyDeclaration] {
&self.declarations &self.declarations
} }
/// Iterate over only PropertyDeclaration. /// The `important` flags for declarations in this block
pub fn declarations_iter(&self) -> PropertyDeclarationIterator { pub fn declarations_importance(&self) -> &SmallBitVec {
PropertyDeclarationIterator { &self.declarations_importance
iter: self.declarations.iter(), }
}
/// Iterate over `(PropertyDeclaration, Importance)` pairs
pub fn declaration_importance_iter(&self) -> DeclarationImportanceIterator {
DeclarationImportanceIterator::new(&self.declarations, &self.declarations_importance)
} }
/// Return an iterator of (AnimatableLonghand, AnimationValue). /// Return an iterator of (AnimatableLonghand, AnimationValue).
@ -206,27 +225,32 @@ impl PropertyDeclarationBlock {
/// Returns whether this block contains any declaration with `!important`. /// Returns whether this block contains any declaration with `!important`.
/// ///
/// This is based on the `important_count` counter, /// This is based on the `declarations_importance` bit-vector,
/// which should be maintained whenever `declarations` is changed. /// which should be maintained whenever `declarations` is changed.
// FIXME: make fields private and maintain it here in methods?
pub fn any_important(&self) -> bool { pub fn any_important(&self) -> bool {
self.important_count > 0 !self.declarations_importance.all_false()
} }
/// Returns whether this block contains any declaration without `!important`. /// Returns whether this block contains any declaration without `!important`.
/// ///
/// This is based on the `important_count` counter, /// This is based on the `declarations_importance` bit-vector,
/// which should be maintained whenever `declarations` is changed. /// which should be maintained whenever `declarations` is changed.
// FIXME: make fields private and maintain it here in methods?
pub fn any_normal(&self) -> bool { pub fn any_normal(&self) -> bool {
self.declarations.len() > self.important_count !self.declarations_importance.all_true()
} }
/// Get a declaration for a given property. /// Get a declaration for a given property.
/// ///
/// NOTE: This is linear time. /// NOTE: This is linear time.
pub fn get(&self, property: PropertyDeclarationId) -> Option< &(PropertyDeclaration, Importance)> { pub fn get(&self, property: PropertyDeclarationId) -> Option<(&PropertyDeclaration, Importance)> {
self.declarations.iter().find(|&&(ref decl, _)| decl.id() == property) self.declarations.iter().enumerate().find(|&(_, decl)| decl.id() == property).map(|(i, decl)| {
let importance = if self.declarations_importance.get(i as u32) {
Importance::Important
} else {
Importance::Normal
};
(decl, importance)
})
} }
/// Find the value of the given property in this block and serialize it /// Find the value of the given property in this block and serialize it
@ -251,7 +275,7 @@ impl PropertyDeclarationBlock {
// Step 1.2.2.2 & 1.2.2.3 // Step 1.2.2.2 & 1.2.2.3
match declaration { match declaration {
Some(&(ref declaration, importance)) => { Some((declaration, importance)) => {
list.push(declaration); list.push(declaration);
if importance.important() { if importance.important() {
important_count += 1; important_count += 1;
@ -277,7 +301,7 @@ impl PropertyDeclarationBlock {
} }
} }
Err(longhand_or_custom) => { Err(longhand_or_custom) => {
if let Some(&(ref value, _importance)) = self.get(longhand_or_custom) { if let Some((value, _importance)) = self.get(longhand_or_custom) {
// Step 2 // Step 2
value.to_css(dest) value.to_css(dest)
} else { } else {
@ -298,7 +322,7 @@ impl PropertyDeclarationBlock {
// Step 2.1 & 2.2 & 2.3 // Step 2.1 & 2.2 & 2.3
if shorthand.longhands().iter().all(|&l| { if shorthand.longhands().iter().all(|&l| {
self.get(PropertyDeclarationId::Longhand(l)) self.get(PropertyDeclarationId::Longhand(l))
.map_or(false, |&(_, importance)| importance.important()) .map_or(false, |(_, importance)| importance.important())
}) { }) {
Importance::Important Importance::Important
} else { } else {
@ -307,7 +331,7 @@ impl PropertyDeclarationBlock {
} }
Err(longhand_or_custom) => { Err(longhand_or_custom) => {
// Step 3 // Step 3
self.get(longhand_or_custom).map_or(Importance::Normal, |&(_, importance)| importance) self.get(longhand_or_custom).map_or(Importance::Normal, |(_, importance)| importance)
} }
} }
} }
@ -409,25 +433,24 @@ impl PropertyDeclarationBlock {
if !definitely_new { if !definitely_new {
let mut index_to_remove = None; let mut index_to_remove = None;
for (i, slot) in self.declarations.iter_mut().enumerate() { for (i, slot) in self.declarations.iter_mut().enumerate() {
if slot.0.id() == declaration.id() { if slot.id() == declaration.id() {
match (slot.1, importance) { let important = self.declarations_importance.get(i as u32);
(Importance::Normal, Importance::Important) => { match (important, importance.important()) {
self.important_count += 1; (false, true) => {}
}
(Importance::Important, Importance::Normal) => { (true, false) => {
if overwrite_more_important_and_reuse_slot { if !overwrite_more_important_and_reuse_slot {
self.important_count -= 1;
} else {
return false return false
} }
} }
_ => if slot.0 == declaration { _ => if *slot == declaration {
return false; return false;
} }
} }
if overwrite_more_important_and_reuse_slot { if overwrite_more_important_and_reuse_slot {
*slot = (declaration, importance); *slot = declaration;
self.declarations_importance.set(i as u32, importance.important());
return true; return true;
} }
@ -441,7 +464,9 @@ impl PropertyDeclarationBlock {
if let Some(index) = index_to_remove { if let Some(index) = index_to_remove {
self.declarations.remove(index); self.declarations.remove(index);
self.declarations.push((declaration, importance)); self.declarations_importance.remove(index as u32);
self.declarations.push(declaration);
self.declarations_importance.push(importance.important());
return true; return true;
} }
} }
@ -449,10 +474,8 @@ impl PropertyDeclarationBlock {
if let Some(id) = longhand_id { if let Some(id) = longhand_id {
self.longhands.insert(id); self.longhands.insert(id);
} }
self.declarations.push((declaration, importance)); self.declarations.push(declaration);
if importance.important() { self.declarations_importance.push(importance.important());
self.important_count += 1;
}
true true
} }
@ -461,21 +484,13 @@ impl PropertyDeclarationBlock {
/// Returns whether any declaration was updated. /// Returns whether any declaration was updated.
pub fn set_importance(&mut self, property: &PropertyId, new_importance: Importance) -> bool { pub fn set_importance(&mut self, property: &PropertyId, new_importance: Importance) -> bool {
let mut updated_at_least_one = false; let mut updated_at_least_one = false;
for &mut (ref declaration, ref mut importance) in &mut self.declarations { for (i, declaration) in self.declarations.iter().enumerate() {
if declaration.id().is_or_is_longhand_of(property) { if declaration.id().is_or_is_longhand_of(property) {
match (*importance, new_importance) { let is_important = new_importance.important();
(Importance::Normal, Importance::Important) => { if self.declarations_importance.get(i as u32) != is_important {
self.important_count += 1; self.declarations_importance.set(i as u32, is_important);
} updated_at_least_one = true;
(Importance::Important, Importance::Normal) => {
self.important_count -= 1;
}
_ => {
continue;
}
} }
updated_at_least_one = true;
*importance = new_importance;
} }
} }
updated_at_least_one updated_at_least_one
@ -490,20 +505,21 @@ impl PropertyDeclarationBlock {
return false return false
} }
} }
let important_count = &mut self.important_count;
let mut removed_at_least_one = false; let mut removed_at_least_one = false;
let longhands = &mut self.longhands; let longhands = &mut self.longhands;
self.declarations.retain(|&(ref declaration, importance)| { let declarations_importance = &mut self.declarations_importance;
let mut i = 0;
self.declarations.retain(|declaration| {
let id = declaration.id(); let id = declaration.id();
let remove = id.is_or_is_longhand_of(property); let remove = id.is_or_is_longhand_of(property);
if remove { if remove {
removed_at_least_one = true; removed_at_least_one = true;
if let PropertyDeclarationId::Longhand(id) = id { if let PropertyDeclarationId::Longhand(id) = id {
longhands.remove(id) longhands.remove(id);
}
if importance.important() {
*important_count -= 1
} }
declarations_importance.remove(i);
} else {
i += 1;
} }
!remove !remove
}); });
@ -527,7 +543,7 @@ impl PropertyDeclarationBlock {
match property.as_shorthand() { match property.as_shorthand() {
Err(_longhand_or_custom) => { Err(_longhand_or_custom) => {
if self.declarations.len() == 1 { if self.declarations.len() == 1 {
let declaration = &self.declarations[0].0; let declaration = &self.declarations[0];
// If we have a longhand declaration with variables, those variables will be // If we have a longhand declaration with variables, those variables will be
// stored as unparsed values. As a temporary measure to produce sensible results // stored as unparsed values. As a temporary measure to produce sensible results
// in Gecko's getKeyframes() implementation for CSS animations, if // in Gecko's getKeyframes() implementation for CSS animations, if
@ -549,10 +565,10 @@ impl PropertyDeclarationBlock {
} }
} }
Ok(shorthand) => { Ok(shorthand) => {
if !self.declarations.iter().all(|decl| decl.0.shorthands().contains(&shorthand)) { if !self.declarations.iter().all(|decl| decl.shorthands().contains(&shorthand)) {
return Err(fmt::Error) return Err(fmt::Error)
} }
let iter = self.declarations_iter(); let iter = self.declarations.iter();
match shorthand.get_shorthand_appendable_value(iter) { match shorthand.get_shorthand_appendable_value(iter) {
Some(AppendableValue::Css { css, .. }) => { Some(AppendableValue::Css { css, .. }) => {
dest.write_str(css) dest.write_str(css)
@ -569,17 +585,18 @@ impl PropertyDeclarationBlock {
/// Convert AnimationValueMap to PropertyDeclarationBlock. /// Convert AnimationValueMap to PropertyDeclarationBlock.
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
pub fn from_animation_value_map(animation_value_map: &AnimationValueMap) -> Self { pub fn from_animation_value_map(animation_value_map: &AnimationValueMap) -> Self {
let mut declarations = vec![]; let len = animation_value_map.len();
let mut declarations = Vec::with_capacity(len);
let mut longhands = LonghandIdSet::new(); let mut longhands = LonghandIdSet::new();
for (property, animation_value) in animation_value_map.iter() { for (property, animation_value) in animation_value_map.iter() {
longhands.set_animatable_longhand_bit(property); longhands.set_animatable_longhand_bit(property);
declarations.push((animation_value.uncompute(), Importance::Normal)); declarations.push(animation_value.uncompute());
} }
PropertyDeclarationBlock { PropertyDeclarationBlock {
declarations: declarations, declarations: declarations,
important_count: 0, declarations_importance: SmallBitVec::from_elem(len as u32, false),
longhands: longhands, longhands: longhands,
} }
} }
@ -593,7 +610,7 @@ impl PropertyDeclarationBlock {
return false return false
} }
} }
self.declarations.iter().any(|&(ref decl, _)| self.declarations.iter().any(|decl|
decl.id().is_or_is_longhand_of(property) && decl.id().is_or_is_longhand_of(property) &&
decl.get_css_wide_keyword().is_some() decl.get_css_wide_keyword().is_some()
) )
@ -613,7 +630,7 @@ impl ToCss for PropertyDeclarationBlock {
let mut already_serialized = PropertyDeclarationIdSet::new(); let mut already_serialized = PropertyDeclarationIdSet::new();
// Step 3 // Step 3
for &(ref declaration, importance) in &*self.declarations { for (declaration, importance) in self.declaration_importance_iter() {
// Step 3.1 // Step 3.1
let property = declaration.id(); let property = declaration.id();
@ -639,13 +656,13 @@ impl ToCss for PropertyDeclarationBlock {
let is_system_font = let is_system_font =
shorthand == ShorthandId::Font && shorthand == ShorthandId::Font &&
self.declarations.iter().any(|&(ref l, _)| { self.declarations.iter().any(|l| {
!already_serialized.contains(l.id()) && !already_serialized.contains(l.id()) &&
l.get_system().is_some() l.get_system().is_some()
}); });
if is_system_font { if is_system_font {
for &(ref longhand, longhand_importance) in &self.declarations { for (longhand, importance) in self.declaration_importance_iter() {
if already_serialized.contains(longhand.id()) { if already_serialized.contains(longhand.id()) {
continue; continue;
} }
@ -655,20 +672,20 @@ impl ToCss for PropertyDeclarationBlock {
if found_system.is_none() { if found_system.is_none() {
found_system = longhand.get_system(); found_system = longhand.get_system();
} }
if longhand_importance.important() { if importance.important() {
important_count += 1; important_count += 1;
} }
} }
} }
} else { } else {
for &(ref longhand, longhand_importance) in &self.declarations { for (longhand, importance) in self.declaration_importance_iter() {
if already_serialized.contains(longhand.id()) { if already_serialized.contains(longhand.id()) {
continue; continue;
} }
if longhand.id().is_longhand_of(shorthand) { if longhand.id().is_longhand_of(shorthand) {
current_longhands.push(longhand); current_longhands.push(longhand);
if longhand_importance.important() { if importance.important() {
important_count += 1; important_count += 1;
} }
} }

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

@ -12,6 +12,7 @@
#[cfg(feature = "servo")] use app_units::Au; #[cfg(feature = "servo")] use app_units::Au;
use servo_arc::{Arc, UniqueArc}; use servo_arc::{Arc, UniqueArc};
use smallbitvec::SmallBitVec;
use std::borrow::Cow; use std::borrow::Cow;
use hash::HashSet; use hash::HashSet;
use std::{fmt, mem, ops}; use std::{fmt, mem, ops};
@ -3007,25 +3008,26 @@ pub fn cascade(
ptr::eq(parent_style.unwrap(), ptr::eq(parent_style.unwrap(),
parent_style_ignoring_first_line.unwrap()) || parent_style_ignoring_first_line.unwrap()) ||
parent_style.unwrap().pseudo() == Some(PseudoElement::FirstLine)); parent_style.unwrap().pseudo() == Some(PseudoElement::FirstLine));
let empty = SmallBitVec::new();
let iter_declarations = || { let iter_declarations = || {
rule_node.self_and_ancestors().flat_map(|node| { rule_node.self_and_ancestors().flat_map(|node| {
let cascade_level = node.cascade_level(); let cascade_level = node.cascade_level();
let source = node.style_source(); let source = node.style_source();
let declarations = if source.is_some() { let declarations = if source.is_some() {
source.read(cascade_level.guard(guards)).declarations() source.read(cascade_level.guard(guards)).declaration_importance_iter()
} else { } else {
// The root node has no style source. // The root node has no style source.
&[] DeclarationImportanceIterator::new(&[], &empty)
}; };
let node_importance = node.importance(); let node_importance = node.importance();
let property_restriction = pseudo.and_then(|p| p.property_restriction()); let property_restriction = pseudo.and_then(|p| p.property_restriction());
declarations declarations
.iter()
// Yield declarations later in source order (with more precedence) first. // Yield declarations later in source order (with more precedence) first.
.rev() .rev()
.filter_map(move |&(ref declaration, declaration_importance)| { .filter_map(move |(declaration, declaration_importance)| {
if let Some(property_restriction) = property_restriction { if let Some(property_restriction) = property_restriction {
// declaration.id() is either a longhand or a custom // declaration.id() is either a longhand or a custom
// property. Custom properties are always allowed, but // property. Custom properties are always allowed, but

11
components/style/rule_tree/mod.rs
View file

@ -1211,15 +1211,15 @@ impl StrongRuleNode {
for node in element_rule_node.self_and_ancestors() { for node in element_rule_node.self_and_ancestors() {
let source = node.style_source(); let source = node.style_source();
let declarations = if source.is_some() { let declarations = if source.is_some() {
source.read(node.cascade_level().guard(guards)).declarations() source.read(node.cascade_level().guard(guards)).declaration_importance_iter()
} else { } else {
continue continue
}; };
// Iterate over declarations of the longhands we care about. // Iterate over declarations of the longhands we care about.
let node_importance = node.importance(); let node_importance = node.importance();
let longhands = declarations.iter().rev() let longhands = declarations.rev()
.filter_map(|&(ref declaration, importance)| { .filter_map(|(declaration, importance)| {
if importance != node_importance { return None } if importance != node_importance { return None }
match declaration.id() { match declaration.id() {
PropertyDeclarationId::Longhand(id) => { PropertyDeclarationId::Longhand(id) => {
@ -1329,9 +1329,8 @@ impl StrongRuleNode {
let mut result = (LonghandIdSet::new(), false); let mut result = (LonghandIdSet::new(), false);
for node in iter { for node in iter {
let style = node.style_source(); let style = node.style_source();
for &(ref decl, important) in style.read(node.cascade_level().guard(guards)) for (decl, important) in style.read(node.cascade_level().guard(guards))
.declarations() .declaration_importance_iter() {
.iter() {
// Although we are only iterating over cascade levels that // Although we are only iterating over cascade levels that
// override animations, in a given property declaration block we // override animations, in a given property declaration block we
// can have a mixture of !important and non-!important // can have a mixture of !important and non-!important

6
components/style/stylesheets/keyframes_rule.rs
View file

@ -299,7 +299,7 @@ impl KeyframesStep {
guard: &SharedRwLockReadGuard) -> Self { guard: &SharedRwLockReadGuard) -> Self {
let declared_timing_function = match value { let declared_timing_function = match value {
KeyframesStepValue::Declarations { ref block } => { KeyframesStepValue::Declarations { ref block } => {
block.read_with(guard).declarations().iter().any(|&(ref prop_decl, _)| { block.read_with(guard).declarations().iter().any(|prop_decl| {
match *prop_decl { match *prop_decl {
PropertyDeclaration::AnimationTimingFunction(..) => true, PropertyDeclaration::AnimationTimingFunction(..) => true,
_ => false, _ => false,
@ -325,7 +325,7 @@ impl KeyframesStep {
match self.value { match self.value {
KeyframesStepValue::Declarations { ref block } => { KeyframesStepValue::Declarations { ref block } => {
let guard = block.read_with(guard); let guard = block.read_with(guard);
let &(ref declaration, _) = let (declaration, _) =
guard.get(PropertyDeclarationId::Longhand(LonghandId::AnimationTimingFunction)).unwrap(); guard.get(PropertyDeclarationId::Longhand(LonghandId::AnimationTimingFunction)).unwrap();
match *declaration { match *declaration {
PropertyDeclaration::AnimationTimingFunction(ref value) => { PropertyDeclaration::AnimationTimingFunction(ref value) => {
@ -369,7 +369,7 @@ fn get_animated_properties(keyframes: &[Arc<Locked<Keyframe>>], guard: &SharedRw
for keyframe in keyframes { for keyframe in keyframes {
let keyframe = keyframe.read_with(&guard); let keyframe = keyframe.read_with(&guard);
let block = keyframe.block.read_with(guard); let block = keyframe.block.read_with(guard);
for &(ref declaration, importance) in block.declarations().iter() { for (declaration, importance) in block.declaration_importance_iter() {
assert!(!importance.important()); assert!(!importance.important());
if let Some(property) = AnimatableLonghand::from_declaration(declaration) { if let Some(property) = AnimatableLonghand::from_declaration(declaration) {

14
ports/geckolib/glue.rs
View file

@ -2212,7 +2212,7 @@ pub extern "C" fn Servo_SerializeFontValueForCanvas(
use style::properties::shorthands::font; use style::properties::shorthands::font;
read_locked_arc(declarations, |decls: &PropertyDeclarationBlock| { read_locked_arc(declarations, |decls: &PropertyDeclarationBlock| {
let longhands = match font::LonghandsToSerialize::from_iter(decls.declarations_iter()) { let longhands = match font::LonghandsToSerialize::from_iter(decls.declarations().iter()) {
Ok(l) => l, Ok(l) => l,
Err(()) => { Err(()) => {
warn!("Unexpected property!"); warn!("Unexpected property!");
@ -2240,7 +2240,7 @@ pub extern "C" fn Servo_DeclarationBlock_Count(declarations: RawServoDeclaration
pub extern "C" fn Servo_DeclarationBlock_GetNthProperty(declarations: RawServoDeclarationBlockBorrowed, pub extern "C" fn Servo_DeclarationBlock_GetNthProperty(declarations: RawServoDeclarationBlockBorrowed,
index: u32, result: *mut nsAString) -> bool { index: u32, result: *mut nsAString) -> bool {
read_locked_arc(declarations, |decls: &PropertyDeclarationBlock| { read_locked_arc(declarations, |decls: &PropertyDeclarationBlock| {
if let Some(&(ref decl, _)) = decls.declarations().get(index as usize) { if let Some(decl) = decls.declarations().get(index as usize) {
let result = unsafe { result.as_mut().unwrap() }; let result = unsafe { result.as_mut().unwrap() };
result.assign_utf8(&decl.id().name()); result.assign_utf8(&decl.id().name());
true true
@ -3312,8 +3312,8 @@ pub extern "C" fn Servo_AnimationValue_Compute(element: RawGeckoElementBorrowed,
let guard = global_style_data.shared_lock.read(); let guard = global_style_data.shared_lock.read();
let declarations = Locked::<PropertyDeclarationBlock>::as_arc(&declarations); let declarations = Locked::<PropertyDeclarationBlock>::as_arc(&declarations);
// We only compute the first element in declarations. // We only compute the first element in declarations.
match declarations.read_with(&guard).declarations().first() { match declarations.read_with(&guard).declaration_importance_iter().next() {
Some(&(ref decl, imp)) if imp == Importance::Normal => { Some((decl, imp)) if imp == Importance::Normal => {
let animation = AnimationValue::from_declaration(decl, &mut context, default_values); let animation = AnimationValue::from_declaration(decl, &mut context, default_values);
animation.map_or(RawServoAnimationValueStrong::null(), |value| { animation.map_or(RawServoAnimationValueStrong::null(), |value| {
Arc::new(value).into_strong() Arc::new(value).into_strong()
@ -3459,11 +3459,9 @@ pub extern "C" fn Servo_StyleSet_GetKeyframesForName(raw_data: RawServoStyleSetB
let animatable = let animatable =
guard.declarations() guard.declarations()
.iter() .iter()
.filter(|&&(ref declaration, _)| { .filter(|declaration| declaration.is_animatable());
declaration.is_animatable()
});
for &(ref declaration, _) in animatable { for declaration in animatable {
let property = AnimatableLonghand::from_declaration(declaration).unwrap(); let property = AnimatableLonghand::from_declaration(declaration).unwrap();
// Skip the 'display' property because although it is animatable from SMIL, // Skip the 'display' property because although it is animatable from SMIL,
// it should not be animatable from CSS Animations. // it should not be animatable from CSS Animations.