Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #14997 - bholley:bug_1329845, r=heycam

Browse source 
stylo: Various crash fixes

Corresponding gecko bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1329854

<!-- 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/14997)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-01-12 19:23:17 -08:00 • committed by GitHub
commit cc8bee8f89
2 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/style/traversal.rs
View file

@ -418,6 +418,19 @@ pub fn recalc_style_at<E, D>(traversal: &D,
(element.has_dirty_descendants() || !propagated_hint.is_empty() || inherited_style_changed) {
preprocess_children(traversal, element, propagated_hint, inherited_style_changed);
}
// Make sure the dirty descendants bit is not set for the root of a
// display:none subtree, even if the style didn't change (since, if
// the style did change, we'd have already cleared it in compute_style).
//
// This keeps the tree in a valid state without requiring the DOM to
// check display:none on the parent when inserting new children (which
// can be moderately expensive). Instead, DOM implementations can
// unconditionally set the dirty descendants bit on any styled parent,
// and let the traversal sort it out.
if data.styles().is_display_none() {
unsafe { element.unset_dirty_descendants(); }
}
}
// Computes style, returning true if the inherited styles changed for this