Custom properties, take 2

components/layout/layout_task.rs

@@ -979,7 +979,7 @@ impl LayoutTask {
             // FIXME: implement used value computation for line-height
             property => {
                 rw_data.resolved_style_response =
-                    style.computed_value_to_string(property.as_slice());
+                    style.computed_value_to_string(property.as_slice()).ok();
             }
         };
     }

components/script/dom/element.rs

@@ -650,15 +650,15 @@ impl Element {
         if let &mut Some(ref mut declarations) = &mut *inline_declarations {
             let index = declarations.normal
                                     .iter()
-                                    .position(|decl| decl.name() == property);
+                                    .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.name() == property);
+                                    .position(|decl| decl.matches(property));
             if let Some(index) = index {
                 Arc::make_mut(&mut declarations.important).remove(index);
                 return;
@@ -715,7 +715,8 @@ impl Element {
             let to = Arc::make_mut(to);
             let mut new_from = Vec::new();
             for declaration in from.drain(..) {
-                if properties.contains(&declaration.name()) {
+                let name = declaration.name();
+                if properties.iter().any(|p| name == **p) {
                     to.push(declaration)
                 } else {
                     new_from.push(declaration)

components/style/Cargo.toml

@@ -23,7 +23,7 @@ git = "https://github.com/servo/rust-selectors"
 features = ["unstable"]
 
 [dependencies.cssparser]
-version = "0.3.6"
+version = "0.3.9"
 features = [ "serde-serialization" ]
 
 [dependencies.url]