diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-03-13 16:50:26 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-13 16:50:26 -0700 |
commit | 8c8edb8731dc01d254839d0922590fba72f278c6 (patch) | |
tree | c0c0297ced2c9b58828f4f68dadd50055e53ce6d /components/script/dom | |
parent | 35028f8f60d172a6bde8133ebe26e887eb33d9e6 (diff) | |
parent | b4de69e3ebf5b2a6e82b68b66df090e9220b9e61 (diff) | |
download | servo-8c8edb8731dc01d254839d0922590fba72f278c6.tar.gz servo-8c8edb8731dc01d254839d0922590fba72f278c6.zip |
Auto merge of #15931 - emilio:die-defaultvalues-die, r=mbrubeck
style: Kill SharedStyleContext::default_computed_values.
This is on top of https://github.com/servo/servo/pull/15928.
Now that cascade() gets a Device ref, we can use the default computed values
from there to avoid propagating that state all over the place.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15931)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/css.rs | 4 | ||||
-rw-r--r-- | components/script/dom/csssupportsrule.rs | 6 | ||||
-rw-r--r-- | components/script/dom/window.rs | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/components/script/dom/css.rs b/components/script/dom/css.rs index e24b3657775..92c15a10067 100644 --- a/components/script/dom/css.rs +++ b/components/script/dom/css.rs @@ -29,7 +29,7 @@ impl CSS { pub fn Supports(win: &Window, property: DOMString, value: DOMString) -> bool { let decl = Declaration { prop: property.into(), val: value.into() }; let url = win.Document().url(); - let context = ParserContext::new_for_cssom(&url); + let context = ParserContext::new_for_cssom(&url, win.css_error_reporter()); decl.eval(&context) } @@ -39,7 +39,7 @@ impl CSS { let cond = parse_condition_or_declaration(&mut input); if let Ok(cond) = cond { let url = win.Document().url(); - let context = ParserContext::new_for_cssom(&url); + let context = ParserContext::new_for_cssom(&url, win.css_error_reporter()); cond.eval(&context) } else { false diff --git a/components/script/dom/csssupportsrule.rs b/components/script/dom/csssupportsrule.rs index 7b1e77a6c8f..0cc113bef1c 100644 --- a/components/script/dom/csssupportsrule.rs +++ b/components/script/dom/csssupportsrule.rs @@ -56,8 +56,10 @@ impl CSSSupportsRule { let mut input = Parser::new(&text); let cond = SupportsCondition::parse(&mut input); if let Ok(cond) = cond { - let url = self.global().as_window().Document().url(); - let context = ParserContext::new_for_cssom(&url); + let global = self.global(); + let win = global.as_window(); + let url = win.Document().url(); + let context = ParserContext::new_for_cssom(&url, win.css_error_reporter()); let enabled = cond.eval(&context); let mut rule = self.supportsrule.write(); rule.condition = cond; diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 64a303c9412..fcb7f85d4cf 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -331,8 +331,8 @@ impl Window { &self.bluetooth_extra_permission_data } - pub fn css_error_reporter(&self) -> Box<ParseErrorReporter + Send> { - self.error_reporter.clone() + pub fn css_error_reporter(&self) -> &ParseErrorReporter { + &self.error_reporter } /// Sets a new list of scroll offsets. |