diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-10-30 07:39:00 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-30 07:39:00 -0500 |
commit | 26279064eb5f6a6ebf8dc97cfe45cc3c95d77276 (patch) | |
tree | 87009867c4d2417fa78719e5113cf3e4fdb8ce02 | |
parent | 1b73cf33525afbbe2d077554d1965b74ef9ae5e3 (diff) | |
parent | f060cbb38c82a29d791f44c41b5b880b56c2ed93 (diff) | |
download | servo-26279064eb5f6a6ebf8dc97cfe45cc3c95d77276.tar.gz servo-26279064eb5f6a6ebf8dc97cfe45cc3c95d77276.zip |
Auto merge of #19060 - emilio:invalidation-fishy, r=nox
style: Fix some fishiness in the invalidation code.
See individual commits for details, I think this is not observable.
<!-- 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/19060)
<!-- Reviewable:end -->
-rw-r--r-- | components/style/invalidation/element/element_wrapper.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/components/style/invalidation/element/element_wrapper.rs b/components/style/invalidation/element/element_wrapper.rs index 5cedff38fa3..8b3fb0385bb 100644 --- a/components/style/invalidation/element/element_wrapper.rs +++ b/components/style/invalidation/element/element_wrapper.rs @@ -348,7 +348,11 @@ impl<'a, E> Element for ElementWrapper<'a, E> } fn pseudo_element_originating_element(&self) -> Option<Self> { - self.element.closest_non_native_anonymous_ancestor() + self.element.pseudo_element_originating_element() .map(|e| ElementWrapper::new(e, self.snapshot_map)) } + + fn blocks_ancestor_combinators(&self) -> bool { + self.element.blocks_ancestor_combinators() + } } |