diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-05-25 05:50:52 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-25 05:50:52 -0500 |
commit | 7780ef5e431b7c346c0f50ff914fbda9b5017900 (patch) | |
tree | a1cc2b00ed6842338474eae49697c51fdc80197f /components/script_layout_interface/wrapper_traits.rs | |
parent | 3016a036503b541f2e4b5693b496ebdc0f5ca411 (diff) | |
parent | cc44f05f446b18b1a473de0228b2e4e5cecb3cc6 (diff) | |
download | servo-7780ef5e431b7c346c0f50ff914fbda9b5017900.tar.gz servo-7780ef5e431b7c346c0f50ff914fbda9b5017900.zip |
Auto merge of #17033 - heycam:default-cs, r=emilio
style: Add support for resolving default computed styles.
Servo-side changes from https://bugzilla.mozilla.org/show_bug.cgi?id=1366157.
<!-- 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/17033)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script_layout_interface/wrapper_traits.rs')
-rw-r--r-- | components/script_layout_interface/wrapper_traits.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/components/script_layout_interface/wrapper_traits.rs b/components/script_layout_interface/wrapper_traits.rs index 2a59e6f768e..c5574dc2a8f 100644 --- a/components/script_layout_interface/wrapper_traits.rs +++ b/components/script_layout_interface/wrapper_traits.rs @@ -25,6 +25,7 @@ use style::font_metrics::ServoMetricsProvider; use style::properties::{CascadeFlags, ServoComputedValues}; use style::selector_parser::{PseudoElement, PseudoElementCascadeType, SelectorImpl}; use style::stylearc::Arc; +use style::stylist::RuleInclusion; use webrender_traits::ClipId; #[derive(Copy, PartialEq, Clone, Debug)] @@ -423,6 +424,7 @@ pub trait ThreadSafeLayoutElement: Clone + Copy + Sized + Debug + &context.guards, unsafe { &self.unsafe_get() }, &style_pseudo, + RuleInclusion::All, data.styles().primary.values(), &ServoMetricsProvider) .unwrap() |