CSSOM bits for @supports: CSSConditionRule and CSSSupportsRule, with conditionText attribute

1 files changed, 21 insertions, 3 deletions

diff --git a/components/script/dom/cssmediarule.rs b/components/script/dom/cssmediarule.rs
index b6b04dde9d8..438b390aea5 100644
--- a/components/script/dom/cssmediarule.rs
+++ b/components/script/dom/cssmediarule.rs
@@ -2,24 +2,26 @@
  * 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 cssparser::Parser;
 use dom::bindings::codegen::Bindings::CSSMediaRuleBinding;
 use dom::bindings::codegen::Bindings::CSSMediaRuleBinding::CSSMediaRuleMethods;
 use dom::bindings::js::{MutNullableJS, Root};
 use dom::bindings::reflector::{DomObject, reflect_dom_object};
 use dom::bindings::str::DOMString;
-use dom::cssgroupingrule::CSSGroupingRule;
+use dom::cssconditionrule::CSSConditionRule;
 use dom::cssrule::SpecificCSSRule;
 use dom::cssstylesheet::CSSStyleSheet;
 use dom::medialist::MediaList;
 use dom::window::Window;
 use parking_lot::RwLock;
 use std::sync::Arc;
+use style::media_queries::parse_media_query_list;
 use style::stylesheets::MediaRule;
 use style_traits::ToCss;
 
 #[dom_struct]
 pub struct CSSMediaRule {
-    cssrule: CSSGroupingRule,
+    cssrule: CSSConditionRule,
     #[ignore_heap_size_of = "Arc"]
     mediarule: Arc<RwLock<MediaRule>>,
     medialist: MutNullableJS<MediaList>,
@@ -30,7 +32,7 @@ impl CSSMediaRule {
                      -> CSSMediaRule {
         let list = mediarule.read().rules.clone();
         CSSMediaRule {
-            cssrule: CSSGroupingRule::new_inherited(parent_stylesheet, list),
+            cssrule: CSSConditionRule::new_inherited(parent_stylesheet, list),
             mediarule: mediarule,
             medialist: MutNullableJS::new(None),
         }
@@ -48,6 +50,22 @@ impl CSSMediaRule {
         self.medialist.or_init(|| MediaList::new(self.global().as_window(),
                                                  self.mediarule.read().media_queries.clone()))
     }
+
+    /// https://drafts.csswg.org/css-conditional-3/#the-cssmediarule-interface
+    pub fn get_condition_text(&self) -> DOMString {
+        let rule = self.mediarule.read();
+        let list = rule.media_queries.read();
+        list.to_css_string().into()
+    }
+
+    /// https://drafts.csswg.org/css-conditional-3/#the-cssmediarule-interface
+    pub fn set_condition_text(&self, text: DOMString) {
+        let mut input = Parser::new(&text);
+        let new_medialist = parse_media_query_list(&mut input);
+        let rule = self.mediarule.read();
+        let mut list = rule.media_queries.write();
+        *list = new_medialist;
+    }
 }
 
 impl SpecificCSSRule for CSSMediaRule {