diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-05-17 05:40:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-17 05:40:14 -0500 |
| commit | d8b7013fcddff79a9c879077e1a564d83201359c (patch) | |
| tree | 88a16d0317249297479192f769217f69a8b39895 /components/script_layout_interface | |
| parent | a7b77306f985b79d3b8b4d9b2cb51fa38f45bd39 (diff) | |
| parent | 522f8489d6fca474e6aad1d341ee84a99c130738 (diff) | |
| download | servo-d8b7013fcddff79a9c879077e1a564d83201359c.tar.gz servo-d8b7013fcddff79a9c879077e1a564d83201359c.zip | |
Auto merge of #16900 - emilio:pseudos, r=bholley
Bug 1364850: Move PseudoElement to be just another combinator in selectors. r=bholley
On top of https://github.com/servo/servo/pull/16890.
<!-- 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/16900)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script_layout_interface')
| -rw-r--r-- | components/script_layout_interface/wrapper_traits.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/components/script_layout_interface/wrapper_traits.rs b/components/script_layout_interface/wrapper_traits.rs index 4f2870aace0..2ba72231269 100644 --- a/components/script_layout_interface/wrapper_traits.rs +++ b/components/script_layout_interface/wrapper_traits.rs @@ -20,7 +20,6 @@ use style::context::SharedStyleContext; use style::data::ElementData; use style::dom::{LayoutIterator, NodeInfo, PresentationalHintsSynthesizer, TNode}; use style::dom::OpaqueNode; -use style::element_state::ElementState; use style::font_metrics::ServoMetricsProvider; use style::properties::{CascadeFlags, ServoComputedValues}; use style::selector_parser::{PseudoElement, PseudoElementCascadeType, SelectorImpl}; @@ -435,7 +434,6 @@ pub trait ThreadSafeLayoutElement: Clone + Copy + Sized + Debug + &context.guards, unsafe { &self.unsafe_get() }, &style_pseudo, - ElementState::empty(), data.styles().primary.values(), &ServoMetricsProvider); data.styles_mut().cached_pseudos |