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

Auto merge of #18538 - emilio:font-size-dep-correct, r=heycam

Browse source 
stylo: Don't add a font-size dependency to the rule cache if the reference size is not our current style.

We enter the Custom(..) code path from other random places, like to remove the
relative lengths from a calc expression while zooming, or whatever craziness
MathML font-size uses, and we don't want to set the dependency on those cases.

<!-- 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/18538)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-09-17 10:45:40 -05:00 • committed by GitHub
commit 4b4a744265
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/style/values/specified/length.rs
View file

@ -132,11 +132,13 @@ impl FontRelativeLength {
match *self {
FontRelativeLength::Em(length) => {
if !matches!(base_size, FontBaseSize::InheritedStyle) {
context.rule_cache_conditions.borrow_mut()
.set_font_size_dependency(
reference_font_size.into()
);
if context.for_non_inherited_property.is_some() {
if matches!(base_size, FontBaseSize::CurrentStyle) {
context.rule_cache_conditions.borrow_mut()
.set_font_size_dependency(
reference_font_size.into()
);
}
}
(reference_font_size, length)
},