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

Auto merge of #17716 - emilio:reconstruct-root, r=heycam

Browse source 
style: Don't early return before updating the root font-size.

We never use the reconstruct path for the root, but feels less handwavy.

<!-- 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/17716)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-07-13 18:57:47 -07:00 • committed by GitHub
commit 394921e33c
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/style/matching.rs
View file

@ -482,11 +482,6 @@ pub trait MatchMethods : TElement {
}
}
// Don't accumulate damage if we're in a restyle for reconstruction.
if context.shared.traversal_flags.for_reconstruct() {
return ChildCascadeRequirement::MustCascadeChildren;
}
let new_primary_style = data.styles.primary.as_ref().unwrap();
let mut cascade_requirement = ChildCascadeRequirement::CanSkipCascade;
@ -506,6 +501,11 @@ pub trait MatchMethods : TElement {
}
}
// Don't accumulate damage if we're in a restyle for reconstruction.
if context.shared.traversal_flags.for_reconstruct() {
return ChildCascadeRequirement::MustCascadeChildren;
}
// Also, don't do anything if there was no style.
let old_primary_style = match old_styles.primary {
Some(s) => s,