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

Auto merge of #18032 - Manishearth:fixes, r=heycam

Browse source 
stylo: Fixes for min font size and logical properties

r=heycam https://bugzilla.mozilla.org/show_bug.cgi?id=1388941 and https://bugzilla.mozilla.org/show_bug.cgi?id=1388943

<!-- 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/18032)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-08-10 00:04:28 -05:00 • committed by GitHub
commit d415617a5b
2 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/style/properties/gecko.mako.rs
View file

@ -2643,12 +2643,13 @@ fn static_assert() {
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub fn set__moz_min_font_size_ratio(&mut self, v: longhands::_moz_min_font_size_ratio::computed_value::T) { pub fn set__moz_min_font_size_ratio(&mut self, v: longhands::_moz_min_font_size_ratio::computed_value::T) {
let percentage = if v.0 > 255. { let scaled = v.0 * 100.;
let percentage = if scaled > 255. {
255. 255.
} else if v.0 < 0. { } else if scaled < 0. {
0. 0.
} else { } else {
v.0 scaled
}; };
self.gecko.mMinFontSizeRatio = percentage as u8; self.gecko.mMinFontSizeRatio = percentage as u8;

22
components/style/rule_tree/mod.rs
View file

@ -1080,6 +1080,19 @@ impl StrongRuleNode {
LonghandId::BorderTopRightRadius, LonghandId::BorderTopRightRadius,
LonghandId::BorderBottomRightRadius, LonghandId::BorderBottomRightRadius,
LonghandId::BorderBottomLeftRadius, LonghandId::BorderBottomLeftRadius,
LonghandId::BorderInlineStartColor,
LonghandId::BorderInlineStartStyle,
LonghandId::BorderInlineStartWidth,
LonghandId::BorderInlineEndColor,
LonghandId::BorderInlineEndStyle,
LonghandId::BorderInlineEndWidth,
LonghandId::BorderBlockStartColor,
LonghandId::BorderBlockStartStyle,
LonghandId::BorderBlockStartWidth,
LonghandId::BorderBlockEndColor,
LonghandId::BorderBlockEndStyle,
LonghandId::BorderBlockEndWidth,
]; ];
const PADDING_PROPS: &'static [LonghandId] = &[ const PADDING_PROPS: &'static [LonghandId] = &[
@ -1087,6 +1100,11 @@ impl StrongRuleNode {
LonghandId::PaddingRight, LonghandId::PaddingRight,
LonghandId::PaddingBottom, LonghandId::PaddingBottom,
LonghandId::PaddingLeft, LonghandId::PaddingLeft,
LonghandId::PaddingInlineStart,
LonghandId::PaddingInlineEnd,
LonghandId::PaddingBlockStart,
LonghandId::PaddingBlockEnd,
]; ];
// Inherited properties: // Inherited properties:
@ -1131,6 +1149,10 @@ impl StrongRuleNode {
LonghandId::BorderRightColor, LonghandId::BorderRightColor,
LonghandId::BorderBottomColor, LonghandId::BorderBottomColor,
LonghandId::BorderLeftColor, LonghandId::BorderLeftColor,
LonghandId::BorderInlineStartColor,
LonghandId::BorderInlineEndColor,
LonghandId::BorderBlockStartColor,
LonghandId::BorderBlockEndColor,
LonghandId::TextShadow, LonghandId::TextShadow,
]; ];