diff options
| author | Xidorn Quan <me@upsuper.org> | 2017-06-13 10:07:06 +1000 |
|---|---|---|
| committer | Xidorn Quan <me@upsuper.org> | 2017-06-13 10:07:06 +1000 |
| commit | cdc537f23e1da29b98e203c5ad7176b49df5450b (patch) | |
| tree | f1cec1a27dd118d32628ebbb886bb2d14582716c /components/script/dom | |
| parent | 1b077303237d5ecb8307f866e9172d0d8e6b132d (diff) | |
| download | servo-cdc537f23e1da29b98e203c5ad7176b49df5450b.tar.gz servo-cdc537f23e1da29b98e203c5ad7176b49df5450b.zip | |
Bug 1331291 part 1 - Set stylesheet url_data correctly for import rule.
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/cssstyledeclaration.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/htmlmetaelement.rs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs index ecf4b35e61c..5def880aa7d 100644 --- a/components/script/dom/cssstyledeclaration.rs +++ b/components/script/dom/cssstyledeclaration.rs @@ -147,7 +147,7 @@ impl CSSStyleOwner { match *self { CSSStyleOwner::Element(ref el) => window_from_node(&**el).Document().base_url(), CSSStyleOwner::CSSRule(ref rule, _) => { - rule.parent_stylesheet().style_stylesheet().url_data.clone() + (*rule.parent_stylesheet().style_stylesheet().url_data.read()).clone() } } } diff --git a/components/script/dom/htmlmetaelement.rs b/components/script/dom/htmlmetaelement.rs index 888855dc7b6..cc11a9d9da4 100644 --- a/components/script/dom/htmlmetaelement.rs +++ b/components/script/dom/htmlmetaelement.rs @@ -19,6 +19,7 @@ use dom::node::{Node, UnbindContext, document_from_node, window_from_node}; use dom::virtualmethods::VirtualMethods; use dom_struct::dom_struct; use html5ever::{LocalName, Prefix}; +use parking_lot::RwLock; use servo_config::prefs::PREFS; use std::ascii::AsciiExt; use std::sync::atomic::AtomicBool; @@ -105,7 +106,7 @@ impl HTMLMetaElement { rules: CssRules::new(vec![rule], shared_lock), origin: Origin::Author, shared_lock: shared_lock.clone(), - url_data: window_from_node(self).get_url(), + url_data: RwLock::new(window_from_node(self).get_url()), namespaces: Default::default(), media: Arc::new(shared_lock.wrap(MediaList::empty())), // Viewport constraints are always recomputed on resize; they don't need to |