auto merge of #678 : metajack/servo/style-attributes, r=jdm

If a style attribute is given for a node, it is parsed and attached to the
Element. When selector matching runs on the Element, the style attribute's
stylesheet is passed in.

Fixes #86.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs
index 7c2a9d13f13..04977ae7931 100644
--- a/src/components/script/dom/element.rs
+++ b/src/components/script/dom/element.rs
@@ -18,6 +18,7 @@ use dom::htmlimageelement::HTMLImageElement;
 use dom::node::{ElementNodeTypeId, Node, ScriptView, AbstractNode};
 use layout_interface::{ContentBoxQuery, ContentBoxResponse, ContentBoxesQuery};
 use layout_interface::{ContentBoxesResponse};
+use newcss::stylesheet::Stylesheet;
 
 use js::jsapi::{JSContext, JSObject};
 
@@ -34,6 +35,7 @@ pub struct Element {
     parent: Node<ScriptView>,
     tag_name: ~str,     // TODO: This should be an atom, not a ~str.
     attrs: ~[Attr],
+    style_attribute: Option<Stylesheet>,
 }
 
 impl CacheableWrapper for Element {
@@ -206,7 +208,8 @@ impl<'self> Element {
         Element {
             parent: Node::new(ElementNodeTypeId(type_id)),
             tag_name: tag_name,
-            attrs: ~[]
+            attrs: ~[],
+            style_attribute: None,
         }
     }