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

Auto merge of #6741 - servo:fix-setpropertypriority, r=pcwalton

Browse source 
Fix CSSStyleDeclaration::setPropertyPriority and some refactoring

r? @Ms2ger

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6741)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-01 15:00:06 -06:00
commit c6b043582b
8 changed files with 197 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,11 +16,12 @@ use dom::window::{Window, WindowHelpers};
use util::str::DOMString;
use selectors::parser::PseudoElement;
use string_cache::Atom;
use style::properties::{is_supported_property, longhands_from_shorthand, parse_style_attribute};
use style::properties::{is_supported_property, longhands_from_shorthand, parse_one_declaration};
use style::properties::PropertyDeclaration;
use std::ascii::AsciiExt;
use std::borrow::ToOwned;
use std::cell::Ref;
// http://dev.w3.org/csswg/cssom/#the-cssstyledeclaration-interface
#[dom_struct]
@ -50,7 +51,7 @@ macro_rules! css_properties(
);
);
fn serialize_list(list: &Vec<PropertyDeclaration>) -> DOMString {
fn serialize_list(list: &[Ref<PropertyDeclaration>]) -> DOMString {
list.iter().fold(String::new(), |accum, ref declaration| {
accum + &declaration.value() + " "
})
@ -78,25 +79,24 @@ impl CSSStyleDeclaration {
}
trait PrivateCSSStyleDeclarationHelpers {
fn get_declaration(self, property: &Atom) -> Option<PropertyDeclaration>;
fn get_important_declaration(self, property: &Atom) -> Option<PropertyDeclaration>;
fn get_computed_style(self, property: &Atom) -> Option<DOMString>;
fn get_declaration(&self, property: &Atom) -> Option<Ref<PropertyDeclaration>>;
fn get_important_declaration(&self, property: &Atom) -> Option<Ref<PropertyDeclaration>>;
}
impl<'a> PrivateCSSStyleDeclarationHelpers for &'a CSSStyleDeclaration {
fn get_declaration(self, property: &Atom) -> Option<PropertyDeclaration> {
let owner = self.owner.root();
let element = ElementCast::from_ref(owner.r());
element.get_inline_style_declaration(property).map(|decl| decl.clone())
impl PrivateCSSStyleDeclarationHelpers for HTMLElement {
fn get_declaration(&self, property: &Atom) -> Option<Ref<PropertyDeclaration>> {
let element = ElementCast::from_ref(self);
element.get_inline_style_declaration(property)
}
fn get_important_declaration(self, property: &Atom) -> Option<PropertyDeclaration> {
let owner = self.owner.root();
let element = ElementCast::from_ref(owner.r());
element.get_important_inline_style_declaration(property).map(|decl| decl.clone())
fn get_important_declaration(&self, property: &Atom) -> Option<Ref<PropertyDeclaration>> {
let element = ElementCast::from_ref(self);
element.get_important_inline_style_declaration(property)
}
}
fn get_computed_style(self, property: &Atom) -> Option<DOMString> {
impl CSSStyleDeclaration {
fn get_computed_style(&self, property: &Atom) -> Option<DOMString> {
let owner = self.owner.root();
let node = NodeCast::from_ref(owner.r());
if !node.is_in_doc() {
@ -144,6 +144,8 @@ impl<'a> CSSStyleDeclarationMethods for &'a CSSStyleDeclaration {
// https://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-getpropertyvalue
fn GetPropertyValue(self, property: DOMString) -> DOMString {
let owner = self.owner.root();
// Step 1
let property = Atom::from_slice(&property.to_ascii_lowercase());
@ -161,7 +163,7 @@ impl<'a> CSSStyleDeclarationMethods for &'a CSSStyleDeclaration {
// Step 2.2
for longhand in longhand_properties.iter() {
// Step 2.2.1
let declaration = self.get_declaration(&Atom::from_slice(&longhand));
let declaration = owner.get_declaration(&Atom::from_slice(&longhand));
// Step 2.2.2 & 2.2.3
match declaration {
@ -175,11 +177,12 @@ impl<'a> CSSStyleDeclarationMethods for &'a CSSStyleDeclaration {
}
// Step 3 & 4
if let Some(ref declaration) = self.get_declaration(&property) {
declaration.value()
} else {
"".to_owned()
}
// FIXME: redundant let binding https://github.com/rust-lang/rust/issues/22252
let result = match owner.get_declaration(&property) {
Some(declaration) => declaration.value(),
None => "".to_owned(),
};
result
}
// https://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-getpropertypriority
@ -192,14 +195,18 @@ impl<'a> CSSStyleDeclarationMethods for &'a CSSStyleDeclaration {
if let Some(longhand_properties) = longhand_properties {
// Step 2.1 & 2.2 & 2.3
if longhand_properties.iter()
.map(|longhand| self.GetPropertyPriority(longhand.clone()))
.map(|&longhand| self.GetPropertyPriority(longhand.to_owned()))
.all(|priority| priority == "important") {
return "important".to_owned();
}
// Step 3
} else if self.get_important_declaration(&property).is_some() {
return "important".to_owned();
} else {
// FIXME: extra let binding https://github.com/rust-lang/rust/issues/22323
let owner = self.owner.root();
if owner.get_important_declaration(&property).is_some() {
return "important".to_owned();
}
}
// Step 4
@ -228,37 +235,31 @@ impl<'a> CSSStyleDeclarationMethods for &'a CSSStyleDeclaration {
}
// Step 5
let priority = priority.to_ascii_lowercase();
if priority != "!important" && !priority.is_empty() {
return Ok(());
}
let priority = match &*priority {
"" => StylePriority::Normal,
p if p.eq_ignore_ascii_case("important") => StylePriority::Important,
_ => return Ok(()),
};
// Step 6
let mut synthesized_declaration = property;
synthesized_declaration.push_str(": ");
synthesized_declaration.push_str(&value);
let owner = self.owner.root();
let window = window_from_node(owner.r());
let decl_block = parse_style_attribute(&synthesized_declaration, &window.r().get_url());
let declarations = parse_one_declaration(&property, &value, &window.r().get_url());
// Step 7
if decl_block.normal.len() == 0 {
let declarations = if let Ok(declarations) = declarations {
declarations
} else {
return Ok(());
}
};
let owner = self.owner.root();
let element = ElementCast::from_ref(owner.r());
// Step 8
for decl in decl_block.normal.iter() {
for decl in declarations {
// Step 9
let style_priority = if priority.is_empty() {
StylePriority::Normal
} else {
StylePriority::Important
};
element.update_inline_style(decl.clone(), style_priority);
element.update_inline_style(decl, priority);
}
let document = document_from_node(element);
@ -274,34 +275,25 @@ impl<'a> CSSStyleDeclarationMethods for &'a CSSStyleDeclaration {
return Err(Error::NoModificationAllowed);
}
// Step 2
let property = property.to_ascii_lowercase();
// Step 3
// Step 2 & 3
if !is_supported_property(&property) {
return Ok(());
}
// Step 4
let priority = priority.to_ascii_lowercase();
if priority != "important" && !priority.is_empty() {
return Ok(());
}
let priority = match &*priority {
"" => StylePriority::Normal,
p if p.eq_ignore_ascii_case("important") => StylePriority::Important,
_ => return Ok(()),
};
let owner = self.owner.root();
let window = window_from_node(owner.r());
let decl_block = parse_style_attribute(&property, &window.r().get_url());
let element = ElementCast::from_ref(owner.r());
// Step 5
for decl in decl_block.normal.iter() {
// Step 6
let style_priority = if priority.is_empty() {
StylePriority::Normal
} else {
StylePriority::Important
};
element.update_inline_style(decl.clone(), style_priority);
// Step 5 & 6
match longhands_from_shorthand(&property) {
Some(properties) => element.set_inline_style_property_priority(properties, priority),
None => element.set_inline_style_property_priority(&[&*property], priority)
}
let document = document_from_node(element);
@ -328,21 +320,18 @@ impl<'a> CSSStyleDeclarationMethods for &'a CSSStyleDeclaration {
// Step 3
let value = self.GetPropertyValue(property.clone());
let longhand_properties = longhands_from_shorthand(&property);
match longhand_properties {
let owner = self.owner.root();
let elem = ElementCast::from_ref(owner.r());
match longhands_from_shorthand(&property) {
// Step 4
Some(longhands) => {
// Step 4
for longhand in longhands.iter() {
try!(self.RemoveProperty(longhand.clone()));
elem.remove_inline_style_property(longhand)
}
}
None => {
// Step 5
let owner = self.owner.root();
let elem = ElementCast::from_ref(owner.r());
elem.remove_inline_style_property(property)
}
// Step 5
None => elem.remove_inline_style_property(&property)
}
// Step 6

78
components/script/dom/element.rs
View file

@ -564,7 +564,7 @@ impl LayoutElementHelpers for LayoutJS<Element> {
}
}
#[derive(PartialEq)]
#[derive(PartialEq, Eq, Copy, Clone)]
pub enum StylePriority {
Important,
Normal,
@ -581,10 +581,11 @@ pub trait ElementHelpers<'a> {
fn style_attribute(self) -> &'a DOMRefCell<Option<PropertyDeclarationBlock>>;
fn summarize(self) -> Vec<AttrInfo>;
fn is_void(self) -> bool;
fn remove_inline_style_property(self, property: DOMString);
fn remove_inline_style_property(self, property: &str);
fn update_inline_style(self, property_decl: PropertyDeclaration, style_priority: StylePriority);
fn get_inline_style_declaration(self, property: &Atom) -> Option<PropertyDeclaration>;
fn get_important_inline_style_declaration(self, property: &Atom) -> Option<PropertyDeclaration>;
fn set_inline_style_property_priority(self, properties: &[&str], style_priority: StylePriority);
fn get_inline_style_declaration(self, property: &Atom) -> Option<Ref<'a, PropertyDeclaration>>;
fn get_important_inline_style_declaration(self, property: &Atom) -> Option<Ref<'a, PropertyDeclaration>>;
fn serialize(self, traversal_scope: TraversalScope) -> Fallible<DOMString>;
fn get_root_element(self) -> Root<Element>;
fn lookup_prefix(self, namespace: Namespace) -> Option<DOMString>;
@ -652,14 +653,14 @@ impl<'a> ElementHelpers<'a> for &'a Element {
}
}
fn remove_inline_style_property(self, property: DOMString) {
fn remove_inline_style_property(self, property: &str) {
let mut inline_declarations = self.style_attribute.borrow_mut();
if let &mut Some(ref mut declarations) = &mut *inline_declarations {
let index = declarations.normal
.iter()
.position(|decl| decl.name() == property);
if let Some(index) = index {
Arc::make_unique(&mut declarations.normal).remove(index);
Arc::get_mut(&mut declarations.normal).unwrap().remove(index);
return;
}
@ -667,7 +668,7 @@ impl<'a> ElementHelpers<'a> for &'a Element {
.iter()
.position(|decl| decl.name() == property);
if let Some(index) = index {
Arc::make_unique(&mut declarations.important).remove(index);
Arc::get_mut(&mut declarations.important).unwrap().remove(index);
return;
}
}
@ -677,10 +678,14 @@ impl<'a> ElementHelpers<'a> for &'a Element {
let mut inline_declarations = self.style_attribute().borrow_mut();
if let &mut Some(ref mut declarations) = &mut *inline_declarations {
let existing_declarations = if style_priority == StylePriority::Important {
Arc::make_unique(&mut declarations.important)
&mut declarations.important
} else {
Arc::make_unique(&mut declarations.normal)
&mut declarations.normal
};
// Element is the only owner of the Arc’s for its style attribute,
// except during selector matching.
// But selector matching does not run concurrently with script.
let existing_declarations = Arc::get_mut(existing_declarations).unwrap();
for declaration in existing_declarations.iter_mut() {
if declaration.name() == property_decl.name() {
@ -704,24 +709,49 @@ impl<'a> ElementHelpers<'a> for &'a Element {
});
}
fn get_inline_style_declaration(self, property: &Atom) -> Option<PropertyDeclaration> {
let inline_declarations = self.style_attribute.borrow();
inline_declarations.as_ref().and_then(|declarations| {
declarations.normal
.iter()
.chain(declarations.important.iter())
.find(|decl| decl.matches(&property))
.map(|decl| decl.clone())
fn set_inline_style_property_priority(self, properties: &[&str], style_priority: StylePriority) {
let mut inline_declarations = self.style_attribute().borrow_mut();
if let &mut Some(ref mut declarations) = &mut *inline_declarations {
let (from, to) = if style_priority == StylePriority::Important {
(&mut declarations.normal, &mut declarations.important)
} else {
(&mut declarations.normal, &mut declarations.important)
};
// Element is the only owner of the Arc’s for its style attribute,
// except during selector matching.
// But selector matching does not run concurrently with script.
let from = Arc::get_mut(from).unwrap();
let to = Arc::get_mut(to).unwrap();
let mut new_from = Vec::new();
for declaration in from.drain(..) {
if properties.contains(&declaration.name()) {
to.push(declaration)
} else {
new_from.push(declaration)
}
}
mem::replace(from, new_from);
}
}
fn get_inline_style_declaration(self, property: &Atom) -> Option<Ref<'a, PropertyDeclaration>> {
Ref::filter_map(self.style_attribute.borrow(), |inline_declarations| {
inline_declarations.as_ref().and_then(|declarations| {
declarations.normal
.iter()
.chain(declarations.important.iter())
.find(|decl| decl.matches(&property))
})
})
}
fn get_important_inline_style_declaration(self, property: &Atom) -> Option<PropertyDeclaration> {
let inline_declarations = self.style_attribute.borrow();
inline_declarations.as_ref().and_then(|declarations| {
declarations.important
.iter()
.find(|decl| decl.matches(&property))
.map(|decl| decl.clone())
fn get_important_inline_style_declaration(self, property: &Atom) -> Option<Ref<'a, PropertyDeclaration>> {
Ref::filter_map(self.style_attribute.borrow(), |inline_declarations| {
inline_declarations.as_ref().and_then(|declarations| {
declarations.important
.iter()
.find(|decl| decl.matches(&property))
})
})
}