diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-05-28 10:03:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-28 10:03:23 -0400 |
| commit | 11edbfc159e30b5dffdf9df4e1880ba02cc3f0f8 (patch) | |
| tree | 3f1e9dcfc3669c4036eee8b5ed7043d532a381b2 /components/layout/construct.rs | |
| parent | 4e6b100c7efdf1eb708c51a76be8835d85722e9a (diff) | |
| parent | bbb59614fa528da3bd484cc2c834f6be2e8e9fd3 (diff) | |
| download | servo-11edbfc159e30b5dffdf9df4e1880ba02cc3f0f8.tar.gz servo-11edbfc159e30b5dffdf9df4e1880ba02cc3f0f8.zip | |
Auto merge of #20871 - emilio:gecko-sync, r=emilio
style: Sync changes from mozilla-central.
See each individual commit for details.
Diffstat (limited to 'components/layout/construct.rs')
| -rw-r--r-- | components/layout/construct.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/layout/construct.rs b/components/layout/construct.rs index 0adde8d7255..efa3ccd176a 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -1533,8 +1533,9 @@ impl<'a, ConcreteThreadSafeLayoutNode> PostorderNodeMutTraversal<ConcreteThreadS let style = node.style(self.style_context()); - // Bail out if this node has an ancestor with display: none. - if style.is_in_display_none_subtree() { + // Bail out if this node is display: none. The style system guarantees + // that we don't arrive here for children of those. + if style.get_box().display.is_none() { self.set_flow_construction_result(node, ConstructionResult::None); return; } |