diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-11-20 08:57:50 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-20 08:57:50 -0600 |
| commit | bc937f54d10265722200acb6458a6983026bd76b (patch) | |
| tree | 10096b50b22ef1c777895b055ede374601b99400 | |
| parent | bea01960588d4130e5519f42817f2eccf372bba6 (diff) | |
| parent | 6a6b5a53ee1b9530602b4976a18a0bb1ff42e6d8 (diff) | |
| download | servo-bc937f54d10265722200acb6458a6983026bd76b.tar.gz servo-bc937f54d10265722200acb6458a6983026bd76b.zip | |
Auto merge of #19303 - emilio:flattened-tree-fallback, r=heycam
style: Account for fallback content in GetFlattenedTreeParent.
Otherwise we may inappropriately style it or what not. This asserts with the
patches of bug 1414999 plus the cleanup of bug 1418456, since we no longer do
StyleNewChildren (which walks over the flattened tree children).
Too bad that GetXBLBinding is a virtual call in Gecko, probably can do just
MAY_BE_IN_BINDING_MGR...
Bug: 1418560
Reviewed-by: heycam
MozReview-Commit-ID: CNU0YdKeaR0
<!-- 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/19303)
<!-- Reviewable:end -->
| -rw-r--r-- | components/style/gecko/wrapper.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs index d26a1d8663e..ec3d6f91968 100644 --- a/components/style/gecko/wrapper.rs +++ b/components/style/gecko/wrapper.rs @@ -227,8 +227,10 @@ impl<'ln> GeckoNode<'ln> { return false; } - if parent_el.map_or(false, |el| el.has_shadow_root()) { - return false; + if let Some(parent) = parent_el { + if parent.has_shadow_root() || parent.get_xbl_binding().is_some() { + return false; + } } true |