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

servo: Move FontComputationData to the end of ServoComputedValues to make size check easier, make it NonZero

Browse source 
We fail bindgen layout tests on 32 bit because FontComputationData does not accurately reflect the size/alignment of the rust-side replacement.

We move it to the end so that alignment is more straightforward, and
use a NonZero enum so that the representation can be more accurately
handled on the C++ side.

MozReview-Commit-ID: 8GlSma3Wl9W
This commit is contained in:
Manish Goregaokar 2017-07-19 18:28:25 -07:00 • committed by Manish Goregaokar
parent 3d3f30a3f9
commit ac1bae4f7a
4 changed files with 78 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

33
components/style/properties/longhand/font.mako.rs
View file

@ -620,16 +620,18 @@ ${helpers.single_keyword_system("font-variant-caps",
#[derive(Debug, Copy, Clone, PartialEq)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
pub enum KeywordSize {
XXSmall = 0,
XSmall = 1,
Small = 2,
Medium = 3,
Large = 4,
XLarge = 5,
XXLarge = 6,
XXSmall = 1, // This is to enable the NonZero optimization
// which simplifies the representation of Option<KeywordSize>
// in bindgen
XSmall,
Small,
Medium,
Large,
XLarge,
XXLarge,
// This is not a real font keyword and will not parse
// HTML font-size 7 corresponds to this value
XXXLarge = 7,
XXXLarge,
}
pub use self::KeywordSize::*;
@ -646,6 +648,19 @@ ${helpers.single_keyword_system("font-variant-caps",
"xx-large" => Ok(XXLarge),
}
}
pub fn html_size(&self) -> u8 {
match *self {
KeywordSize::XXSmall => 0,
KeywordSize::XSmall => 1,
KeywordSize::Small => 2,
KeywordSize::Medium => 3,
KeywordSize::Large => 4,
KeywordSize::XLarge => 5,
KeywordSize::XXLarge => 6,
KeywordSize::XXXLarge => 7,
}
}
}
impl Default for KeywordSize {
@ -731,7 +746,7 @@ ${helpers.single_keyword_system("font-variant-caps",
}) };
let base_size_px = au_to_int_px(base_size as f32);
let html_size = *self as usize;
let html_size = self.html_size() as usize;
if base_size_px >= 9 && base_size_px <= 16 {
Au::from_px(FONT_SIZE_MAPPING[(base_size_px - 9) as usize][html_size])
} else {