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

Auto merge of #19371 - emilio:doc-colors, r=whoops

Browse source 
style: Don't insert into the `seen` set before ignoring document colors.

Otherwise we may stop honoring other colors in other cascade levels.

Fixes: #19370

<!-- 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/19371)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-11-24 19:10:00 -06:00 • committed by GitHub
commit 2377d60fa1
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/style/properties/properties.mako.rs
View file

@ -3330,7 +3330,6 @@ where
if seen.contains(physical_longhand_id) { if seen.contains(physical_longhand_id) {
continue continue
} }
seen.insert(physical_longhand_id);
let mut declaration = match *declaration { let mut declaration = match *declaration {
PropertyDeclaration::WithVariables(id, ref unparsed) => { PropertyDeclaration::WithVariables(id, ref unparsed) => {
@ -3376,6 +3375,8 @@ where
} }
} }
seen.insert(physical_longhand_id);
% if category_to_cascade_now == "early": % if category_to_cascade_now == "early":
if LonghandId::FontSize == longhand_id { if LonghandId::FontSize == longhand_id {
font_size = Some(declaration.clone()); font_size = Some(declaration.clone());