diff options
Diffstat (limited to 'components/script/dom/cssgroupingrule.rs')
| -rw-r--r-- | components/script/dom/cssgroupingrule.rs | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/components/script/dom/cssgroupingrule.rs b/components/script/dom/cssgroupingrule.rs index e8651c551d3..b793b04b28c 100644 --- a/components/script/dom/cssgroupingrule.rs +++ b/components/script/dom/cssgroupingrule.rs @@ -2,17 +2,15 @@ * 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::CSSGroupingRuleBinding; use dom::bindings::codegen::Bindings::CSSGroupingRuleBinding::CSSGroupingRuleMethods; use dom::bindings::error::{ErrorResult, Fallible}; use dom::bindings::inheritance::Castable; -use dom::bindings::js::{JS, MutNullableHeap, Root}; -use dom::bindings::reflector::{DomObject, reflect_dom_object}; +use dom::bindings::js::{MutNullableJS, Root}; +use dom::bindings::reflector::DomObject; use dom::bindings::str::DOMString; use dom::cssrule::CSSRule; use dom::cssrulelist::{CSSRuleList, RulesSource}; use dom::cssstylesheet::CSSStyleSheet; -use dom::window::Window; use parking_lot::RwLock; use std::sync::Arc; use style::stylesheets::CssRules as StyleCssRules; @@ -22,7 +20,7 @@ pub struct CSSGroupingRule { cssrule: CSSRule, #[ignore_heap_size_of = "Arc"] rules: Arc<RwLock<StyleCssRules>>, - rulelist: MutNullableHeap<JS<CSSRuleList>>, + rulelist: MutNullableJS<CSSRuleList>, } impl CSSGroupingRule { @@ -31,18 +29,10 @@ impl CSSGroupingRule { CSSGroupingRule { cssrule: CSSRule::new_inherited(parent_stylesheet), rules: rules, - rulelist: MutNullableHeap::new(None), + rulelist: MutNullableJS::new(None), } } - #[allow(unrooted_must_root)] - pub fn new(window: &Window, parent_stylesheet: &CSSStyleSheet, - rules: Arc<RwLock<StyleCssRules>>) -> Root<CSSGroupingRule> { - reflect_dom_object(box CSSGroupingRule::new_inherited(parent_stylesheet, rules), - window, - CSSGroupingRuleBinding::Wrap) - } - fn rulelist(&self) -> Root<CSSRuleList> { let parent_stylesheet = self.upcast::<CSSRule>().parent_stylesheet(); self.rulelist.or_init(|| CSSRuleList::new(self.global().as_window(), |