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_layout_interface/wrapper_traits.rs | |
| 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_layout_interface/wrapper_traits.rs')
| -rw-r--r-- | components/script_layout_interface/wrapper_traits.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/components/script_layout_interface/wrapper_traits.rs b/components/script_layout_interface/wrapper_traits.rs index d8768384245..0e7cb160334 100644 --- a/components/script_layout_interface/wrapper_traits.rs +++ b/components/script_layout_interface/wrapper_traits.rs @@ -407,7 +407,6 @@ pub trait ThreadSafeLayoutElement: Clone + Copy + Sized + Debug + context.stylist.precomputed_values_for_pseudo( &style_pseudo, Some(data.styles().primary.values()), - &context.default_computed_values, CascadeFlags::empty()); data.styles_mut().pseudos .insert(style_pseudo.clone(), new_style); @@ -424,8 +423,7 @@ pub trait ThreadSafeLayoutElement: Clone + Copy + Sized + Debug + .lazily_compute_pseudo_element_style( unsafe { &self.unsafe_get() }, &style_pseudo, - data.styles().primary.values(), - &context.default_computed_values); + data.styles().primary.values()); data.styles_mut().pseudos .insert(style_pseudo.clone(), new_style.unwrap()); } |