aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-10-18 12:44:32 -0500
committerGitHub <noreply@github.com>2017-10-18 12:44:32 -0500
commiteea678c1412e2bb7db7f9a7459d1b68ef57c55f2 (patch)
tree3576cac78590b0cf0c1673ebc3c05dbaeed16f9f
parent421baa854ea40c7b1a3d1e75acac14da04a3fbcc (diff)
parent97c9dae40dba494fd03482d48a9a46b50aa1c407 (diff)
downloadservo-eea678c1412e2bb7db7f9a7459d1b68ef57c55f2.tar.gz
servo-eea678c1412e2bb7db7f9a7459d1b68ef57c55f2.zip
Auto merge of #18937 - emilio:shadow-proper-flattened-tree, r=heycam
style: Use a proper flattened tree iterator if we're under a shadow tree. <!-- 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/18937) <!-- Reviewable:end -->
-rw-r--r--components/style/gecko/wrapper.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
index 3ba4b5d470f..908af2b6bd3 100644
--- a/components/style/gecko/wrapper.rs
+++ b/components/style/gecko/wrapper.rs
@@ -867,6 +867,7 @@ impl<'le> TElement for GeckoElement<'le> {
// ::before/::after, XBL bindings, or nsIAnonymousContentCreators.
if self.is_in_anonymous_subtree() ||
self.has_xbl_binding_with_content() ||
+ self.is_in_shadow_tree() ||
self.may_have_anonymous_children() {
unsafe {
let mut iter: structs::StyleChildrenIterator = ::std::mem::zeroed();