aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/cssgroupingrule.rs
diff options
context:
space:
mode:
authorXidorn Quan <me@upsuper.org>2016-11-28 12:44:52 +1100
committerXidorn Quan <me@upsuper.org>2016-11-29 22:15:13 +1100
commit599eb1c9f0b2233751608c8a4a74a0ab64a0dd1a (patch)
treec9349b8547ef7e519c3dff8fad72831480dbf429 /components/script/dom/cssgroupingrule.rs
parent40917e7991ddd0f1fdcf83f0bf637a721f37256a (diff)
downloadservo-599eb1c9f0b2233751608c8a4a74a0ab64a0dd1a.tar.gz
servo-599eb1c9f0b2233751608c8a4a74a0ab64a0dd1a.zip
Move Arc<RwLock<_>> out from CssRules tuple
Diffstat (limited to 'components/script/dom/cssgroupingrule.rs')
-rw-r--r--components/script/dom/cssgroupingrule.rs9
1 files changed, 6 insertions, 3 deletions
diff --git a/components/script/dom/cssgroupingrule.rs b/components/script/dom/cssgroupingrule.rs
index aa381dcbaec..7176dda8d12 100644
--- a/components/script/dom/cssgroupingrule.rs
+++ b/components/script/dom/cssgroupingrule.rs
@@ -13,19 +13,21 @@ 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;
#[dom_struct]
pub struct CSSGroupingRule {
cssrule: CSSRule,
#[ignore_heap_size_of = "Arc"]
- rules: StyleCssRules,
+ rules: Arc<RwLock<StyleCssRules>>,
rulelist: MutNullableHeap<JS<CSSRuleList>>,
}
impl CSSGroupingRule {
pub fn new_inherited(parent_stylesheet: &CSSStyleSheet,
- rules: StyleCssRules) -> CSSGroupingRule {
+ rules: Arc<RwLock<StyleCssRules>>) -> CSSGroupingRule {
CSSGroupingRule {
cssrule: CSSRule::new_inherited(parent_stylesheet),
rules: rules,
@@ -34,7 +36,8 @@ impl CSSGroupingRule {
}
#[allow(unrooted_must_root)]
- pub fn new(window: &Window, parent_stylesheet: &CSSStyleSheet, rules: StyleCssRules) -> Root<CSSGroupingRule> {
+ 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)