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

Added sync_property_with_attrs_style method to serialize style string when inline style is changed

Browse source
This commit is contained in:
David Raifaizen 2016-02-29 09:24:03 -05:00 • committed by Simon Sapin
parent b4d8f3ba3a
commit 839a7559e7
1 changed files with 102 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -698,89 +698,129 @@ impl Element {
} }
} }
pub fn remove_inline_style_property(&self, property: &str) { fn sync_property_with_attrs_style(&self) {
let mut inline_declarations = self.style_attribute.borrow_mut(); let mut style_str = String::new();
if let &mut Some(ref mut declarations) = &mut *inline_declarations {
let index = declarations.normal
.iter()
.position(|decl| decl.matches(property));
if let Some(index) = index {
Arc::make_mut(&mut declarations.normal).remove(index);
return;
}
let index = declarations.important if let &Some(ref declarations) = &*self.style_attribute().borrow() {
.iter() style_str.push_str(&declarations.serialize());
.position(|decl| decl.matches(property)); }
if let Some(index) = index {
Arc::make_mut(&mut declarations.important).remove(index); let new_style = AttrValue::String(style_str);
return;
if let Some(style_attr) = self.attrs.borrow().iter().find(|a| a.name() == &atom!("style")) {
style_attr.set_value(new_style, self);
return;
}
self.push_new_attribute(
atom!("style"),
new_style,
atom!("style"),
ns!(),
Some(atom!("style"))
);
}
pub fn remove_inline_style_property(&self, property: &str) {
fn remove(element: &Element, property: &str) {
let mut inline_declarations = element.style_attribute.borrow_mut();
if let &mut Some(ref mut declarations) = &mut *inline_declarations {
let index = declarations.normal
.iter()
.position(|decl| decl.matches(property));
if let Some(index) = index {
Arc::make_mut(&mut declarations.normal).remove(index);
return;
}
let index = declarations.important
.iter()
.position(|decl| decl.matches(property));
if let Some(index) = index {
Arc::make_mut(&mut declarations.important).remove(index);
return;
}
} }
} }
remove(self, property);
self.sync_property_with_attrs_style();
} }
pub fn update_inline_style(&self, pub fn update_inline_style(&self,
property_decl: PropertyDeclaration, property_decl: PropertyDeclaration,
style_priority: StylePriority) { style_priority: StylePriority) {
let mut inline_declarations = self.style_attribute().borrow_mut();
if let &mut Some(ref mut declarations) = &mut *inline_declarations { fn update(element: &Element, property_decl: PropertyDeclaration, style_priority: StylePriority) {
let existing_declarations = if style_priority == StylePriority::Important { let mut inline_declarations = element.style_attribute().borrow_mut();
&mut declarations.important if let &mut Some(ref mut declarations) = &mut *inline_declarations {
let existing_declarations = if style_priority == StylePriority::Important {
&mut declarations.important
} else {
&mut declarations.normal
};
// Usually, the reference count will be 1 here. But transitions could make it greater
// than that.
let existing_declarations = Arc::make_mut(existing_declarations);
for declaration in &mut *existing_declarations {
if declaration.name() == property_decl.name() {
*declaration = property_decl;
return;
}
}
// inserting instead of pushing since the declarations are in reverse order
existing_declarations.insert(0, property_decl);
return;
}
let (important, normal) = if style_priority == StylePriority::Important {
(vec![property_decl], vec![])
} else { } else {
&mut declarations.normal (vec![], vec![property_decl])
}; };
// Usually, the reference count will be 1 here. But transitions could make it greater *inline_declarations = Some(PropertyDeclarationBlock {
// than that. important: Arc::new(important),
let existing_declarations = Arc::make_mut(existing_declarations); normal: Arc::new(normal),
for declaration in &mut *existing_declarations { });
if declaration.name() == property_decl.name() {
*declaration = property_decl;
return;
}
}
existing_declarations.push(property_decl);
return;
} }
let (important, normal) = if style_priority == StylePriority::Important { update(self, property_decl, style_priority);
(vec![property_decl], vec![]) self.sync_property_with_attrs_style();
} else {
(vec![], vec![property_decl])
};
*inline_declarations = Some(PropertyDeclarationBlock {
important: Arc::new(important),
normal: Arc::new(normal),
});
} }
pub fn set_inline_style_property_priority(&self, pub fn set_inline_style_property_priority(&self,
properties: &[&str], properties: &[&str],
style_priority: StylePriority) { style_priority: StylePriority) {
let mut inline_declarations = self.style_attribute().borrow_mut(); {
if let &mut Some(ref mut declarations) = &mut *inline_declarations { let mut inline_declarations = self.style_attribute().borrow_mut();
let (from, to) = if style_priority == StylePriority::Important { if let &mut Some(ref mut declarations) = &mut *inline_declarations {
(&mut declarations.normal, &mut declarations.important) let (from, to) = if style_priority == StylePriority::Important {
} else { (&mut declarations.normal, &mut declarations.important)
(&mut declarations.important, &mut declarations.normal) } else {
}; (&mut declarations.important, &mut declarations.normal)
};
// Usually, the reference counts of `from` and `to` will be 1 here. But transitions // Usually, the reference counts of `from` and `to` will be 1 here. But transitions
// could make them greater than that. // could make them greater than that.
let from = Arc::make_mut(from); let from = Arc::make_mut(from);
let to = Arc::make_mut(to); let to = Arc::make_mut(to);
let mut new_from = Vec::new(); let mut new_from = Vec::new();
for declaration in from.drain(..) { for declaration in from.drain(..) {
let name = declaration.name(); let name = declaration.name();
if properties.iter().any(|p| name == **p) { if properties.iter().any(|p| name == **p) {
to.push(declaration) to.push(declaration)
} else { } else {
new_from.push(declaration) new_from.push(declaration)
} }
}
mem::replace(from, new_from);
} }
mem::replace(from, new_from);
} }
self.sync_property_with_attrs_style();
} }
pub fn get_inline_style_declaration(&self, pub fn get_inline_style_declaration(&self,