addressed majority of review comments

components/script/dom/bindings/trace.rs

@@ -94,6 +94,9 @@ use url::Url;
 use util::str::{DOMString, LengthOrPercentageOrAuto};
 use uuid::Uuid;
 use webrender_traits::WebGLError;
+use style::selector_impl::ServoSelectorImpl;
+use style::stylesheets::CSSRule;
+
 
 /// A trait to allow tracing (only) DOM objects.
 pub trait JSTraceable {
@@ -324,6 +327,11 @@ no_jsmanaged_fields!(ElementSnapshot);
 no_jsmanaged_fields!(HttpsState);
 no_jsmanaged_fields!(SharedRt);
 no_jsmanaged_fields!(TouchpadPressurePhase);
+no_jsmanaged_fields!(ServoSelectorImpl);
+
+impl JSTraceable for CSSRule<ServoSelectorImpl> {
+    fn trace(&self, _: *mut JSTracer) {}
+}
 
 impl JSTraceable for ConstellationChan<ScriptMsg> {
     #[inline]

components/script/dom/cssrule.rs

@@ -2,44 +2,36 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-//use dom::cssrule::CSSRule;
 use dom::bindings::codegen::Bindings::CSSRuleBinding;
+use dom::bindings::codegen::Bindings::CSSRuleBinding::CSSRuleConstants;
 use dom::bindings::codegen::Bindings::CSSRuleBinding::CSSRuleMethods;
 use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{Root};
 use dom::bindings::reflector::{Reflector, reflect_dom_object};
+use dom::cssstylerule::CSSStyleRule;
 use dom::window::Window;
-use util::str::DOMString;
+use style::selector_impl::ServoSelectorImpl;
+use style::stylesheets;
 
 
 #[dom_struct]
 pub struct CSSRule {
     reflector_: Reflector,
-    /*const STYLE_RULE: u16 = 1;
-    const unsigned short CHARSET_RULE= 2; // historical
-    const unsigned short IMPORT_RULE = 3;
-    const unsigned short MEDIA_RULE = 4;
-    const unsigned short FONT_FACE_RULE = 5;
-    const unsigned short PAGE_RULE = 6;
-    const unsigned short MARGIN_RULE = 9;
-    const unsigned short NAMESPACE_RULE = 10;*/
-    type_: u16,
-    //cssText: DOMString,
+    rule: stylesheets::CSSRule<ServoSelectorImpl>,
 }
 
 impl CSSRule {
     #[allow(unrooted_must_root)]
-    fn new_inherited(type_: u16) -> CSSRule {
+    fn new_inherited(rule: stylesheets::CSSRule<ServoSelectorImpl>) -> CSSRule {
         CSSRule {
             reflector_: Reflector::new(),
-            type_: type_
-            //cssText: cssText
+            rule: rule
         }
     }
 
     #[allow(unrooted_must_root)]
-    pub fn new(window: &Window, type_: u16) -> Root<CSSRule> {
-        reflect_dom_object(box CSSRule::new_inherited(type_),
+    pub fn new(window: &Window, rule: stylesheets::CSSRule<ServoSelectorImpl>) -> Root<CSSRule> {
+        reflect_dom_object(box CSSRule::new_inherited(rule),
                            GlobalRef::Window(window),
                            CSSRuleBinding::Wrap)
     }
@@ -49,21 +41,9 @@ impl CSSRuleMethods for CSSRule {
     // https://drafts.csswg.org/cssom/#dom-cssrule-type
     fn Type_(&self) -> u16 {
 
-        if self.eq(&self){
-           1}
-        else if self.eq(&self){
-           3}
-        else if self.eq(&self){
-           4}
-        else if self.eq(&self){
-           5}
-        else if self.eq(&self){
-           6}
-        else if self.eq(&self){
-           8}
-        else if self.eq(&self){
-           10}
-        else{
-           7}
+        match &self{
+           CSSStyleRule => CSSRuleConstants::STYLE_RULE,
+        }
+        //TODO match for other rules
     }
 }

components/script/dom/cssrulelist.rs

@@ -8,27 +8,26 @@ use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{JS, Root};
 use dom::bindings::reflector::{Reflector, reflect_dom_object};
 use dom::cssrule::CSSRule;
-//use dom::cssstylesheet::CSSStyleSheet;
-use style::servo::Stylesheet;
+use dom::cssstylesheet::CSSStyleSheet;
 use dom::window::Window;
 
 #[dom_struct]
 pub struct CSSRuleList {
     reflector_: Reflector,
-    stylesheet: Stylesheet,
+    stylesheet: JS<CSSStyleSheet>,
 }
 
 impl CSSRuleList {
     #[allow(unrooted_must_root)]
-    fn new_inherited(stylesheet: Stylesheet) -> CSSRuleList {
+    fn new_inherited(stylesheet: JS<CSSStyleSheet>) -> CSSRuleList {
         CSSRuleList {
             reflector_: Reflector::new(),
             stylesheet: stylesheet
         }
     }
 
     #[allow(unrooted_must_root)]
-    pub fn new(window: &Window, stylesheet: Stylesheet) -> Root<CSSRuleList> {
+    pub fn new(window: &Window, stylesheet: JS<CSSStyleSheet>) -> Root<CSSRuleList> {
         reflect_dom_object(box CSSRuleList::new_inherited(stylesheet),
                            GlobalRef::Window(window), CSSRuleListBinding::Wrap)
     }
@@ -37,7 +36,8 @@ impl CSSRuleList {
 impl CSSRuleListMethods for CSSRuleList {
     // https://drafts.csswg.org/cssom/#dom-stylesheetlist-length
     fn Length(&self) -> u32 {
-       self.stylesheet.rules.len() as u32
+       //self.stylesheet.cssRules().len() as u32
+       0
     }
 
     // https://drafts.csswg.org/cssom/#dom-stylesheetlist-item

components/script/dom/cssstylerule.rs

@@ -0,0 +1,44 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use dom::bindings::codegen::Bindings::CSSStyleRuleBinding;
+use dom::bindings::codegen::Bindings::CSSStyleRuleBinding::CSSStyleRuleMethods;
+use dom::bindings::global::GlobalRef;
+use dom::bindings::js::{Root};
+use dom::bindings::reflector::{Reflector, reflect_dom_object};
+use dom::window::Window;
+use util::str::DOMString;
+
+
+#[dom_struct]
+pub struct CSSStyleRule {
+    reflector_: Reflector,
+    selectortext: DOMString,
+}
+
+impl CSSStyleRule {
+    #[allow(unrooted_must_root)]
+    fn new_inherited(selectortext: DOMString) -> CSSStyleRule {
+        CSSStyleRule {
+            reflector_: Reflector::new(),
+            selectortext: selectortext,
+        }
+    }
+
+    #[allow(unrooted_must_root)]
+    pub fn new(window: &Window, selectortext: DOMString) -> Root<CSSStyleRule> {
+        reflect_dom_object(box CSSStyleRule::new_inherited(selectortext),
+                           GlobalRef::Window(window),
+                           CSSStyleRuleBinding::Wrap)
+    }
+}
+
+impl CSSStyleRuleMethods for CSSStyleRule {
+    // https://drafts.csswg.org/cssom/#dom-cssstylerule-selectortext
+    fn SelectorText(&self) -> DOMString {
+         self.selectortext.clone()
+    }
+    fn SetSelectorText(&self, value: DOMString) -> (){
+    }
+}

components/script/dom/cssstylesheet.rs

@@ -3,50 +3,43 @@ use dom::bindings::codegen::Bindings::CSSStyleSheetBinding::CSSStyleSheetMethods
 use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{Root};
 use dom::bindings::reflector::{Reflector, reflect_dom_object};
-use dom::cssrule::CSSRule;
 use dom::cssrulelist::CSSRuleList;
 use dom::window::Window;
 use style::servo::Stylesheet;
 use std::sync::Arc;
-use util::str::DOMString;
 
 #[dom_struct]
 pub struct CSSStyleSheet {
-	reflector_: Reflector,
+        reflector_: Reflector,
 	stylesheet: Arc<Stylesheet>,
-	//ownerRule: CSSRule,
-	//cssRules: CSSRuleList,
+	cssrules: Root<CSSRuleList>,
 }
 
 impl CSSStyleSheet {
     #[allow(unrooted_must_root)]
-    fn new_inherited(stylesheet: Arc<Stylesheet>) -> CSSStyleSheet {
+    fn new_inherited(stylesheet: Arc<Stylesheet>, cssrules: Root<CSSRuleList>) -> CSSStyleSheet {
         CSSStyleSheet {
-        	reflector_: Reflector::new(),
-            //stylesheet: Arc::new(stylesheet)
+            reflector_: Reflector::new(),
             stylesheet: stylesheet,
+            cssrules: cssrules, // cssrule: CSSRule::new(),
         }
     }
 
     #[allow(unrooted_must_root)]
-    pub fn new(window: &Window, stylesheet: Arc<Stylesheet>) -> Root<CSSStyleSheet> {
-        reflect_dom_object(box CSSStyleSheet::new_inherited(stylesheet),
+    pub fn new(window: &Window, stylesheet: Arc<Stylesheet>, cssrules: Root<CSSRuleList>) -> Root<CSSStyleSheet> {
+        reflect_dom_object(box CSSStyleSheet::new_inherited(stylesheet, cssrules),
                            GlobalRef::Window(window),
                            CSSStyleSheetBinding::Wrap)
     }
 }
 
 impl CSSStyleSheetMethods for CSSStyleSheet {
-
-	fn InsertRule(&self, rule: DOMString, index: u32) -> u32 {
-		0
+	fn CssRules(&self) -> Root<CSSRuleList>  {
+	     /*if self.disabled() == false {
+                 panic!(DOMErrorName::SecurityError)
+             }
+             else{*/
+                self.cssrules.clone()
+             //}    
 	}
-
-	fn DeleteRule(&self, index: u32) {
-		//self.stylesheet.borrow_mut().rules.remove(index);
-	}
-
-	/*fn CssRules(&self) -> Root<CSSRuleList> {
-
-	}*/
-}
+}

components/script/dom/document.rs

@@ -1814,18 +1814,18 @@ impl Document {
         }
     }
 
-    /*pub fn generate_css_style_sheet(&self, index: u32) -> Root<CSSStyleSheet> {
+    /*pub fn get_nth_cssstylesheet(&self, index: u32) -> Root<CSSStyleSheet> {
 
-        //let mut stylesheets = self.stylesheets.borrow_mut();
-        /*stylesheets.unwrap()*/
-        //let (ref mut node, ref mut sheet) = 
+        let mut stylesheets = self.stylesheets.borrow_mut();
+        //stylesheets.unwrap()
+        let (ref mut node, ref mut sheet) = 
         self.stylesheets.borrow().as_ref().unwrap().iter()
                         .map(|&(_, ref stylesheet)| stylesheet.clone())
                         .collect()
 
         //let sheet = (self.stylesheets.borrow().as_ref().unwrap()[index]).1.clone();
         let (ref mut node, ref mut sheet) = (*self.stylesheets.borrow()).unwrap()[index as usize];
-        CSSStyleSheet::new(&self.window, *sheet)
+        CSSStyleSheet::new(&self.window, *sheet, ? )
     }*/
 }
 

components/script/dom/mod.rs

@@ -239,6 +239,7 @@ pub mod crypto;
 pub mod css;
 pub mod cssrule;
 pub mod cssrulelist;
+pub mod cssstylerule;
 pub mod cssstylesheet;
 pub mod cssstyledeclaration;
 pub mod customevent;

components/script/dom/webidls/CSSRule.webidl

@@ -1,12 +1,12 @@
 interface CSSRule {
   const unsigned short STYLE_RULE = 1;
-  /*const unsigned short CHARSET_RULE= 2; // historical
+  const unsigned short CHARSET_RULE= 2; // historical
   const unsigned short IMPORT_RULE = 3;
   const unsigned short MEDIA_RULE = 4;
   const unsigned short FONT_FACE_RULE = 5;
   const unsigned short PAGE_RULE = 6;
   const unsigned short MARGIN_RULE = 9;
-  const unsigned short NAMESPACE_RULE = 10;*/
+  const unsigned short NAMESPACE_RULE = 10;
   readonly attribute unsigned short type_;
   //attribute DOMString cssText;
   //readonly attribute CSSRule? parentRule;

components/script/dom/webidls/CSSStyleRule.webidl

@@ -0,0 +1,10 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// https://drafts.csswg.org/cssom/#the-CSSStyleRule-interface
+interface CSSStyleRule : CSSRule {
+  attribute DOMString selectorText;
+  //[SameObject, PutForwards=cssText] readonly attribute CSSStyleDeclaration style;
+};

components/script/dom/webidls/CSSStyleSheet.webidl

@@ -1,7 +1,7 @@
 
 interface CSSStyleSheet : StyleSheet {
     //readonly attribute CSSRule? ownerRule;
-    //[SameObject] readonly attribute CSSRuleList cssRules;
-    unsigned long insertRule(DOMString rule, unsigned long index);
-    void deleteRule(unsigned long index);
-};
+    [SameObject] readonly attribute CSSRuleList cssRules;
+    //unsigned long insertRule(DOMString rule, unsigned long index);
+    //void deleteRule(unsigned long index);
+};