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

Do not use CVAS for FontSettings<T>

Browse source
This commit is contained in:
Anthony Ramine 2017-09-11 16:48:20 +02:00
parent def983c295
commit bf034a83e8
4 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/style/properties/helpers.mako.rs
View file

@ -316,7 +316,7 @@
% if not property.derived_from: % if not property.derived_from:
match value { match value {
DeclaredValue::Value(ref specified_value) => { DeclaredValue::Value(specified_value) => {
% if property.ident in SYSTEM_FONT_LONGHANDS and product == "gecko": % if property.ident in SYSTEM_FONT_LONGHANDS and product == "gecko":
if let Some(sf) = specified_value.get_system() { if let Some(sf) = specified_value.get_system() {
longhands::system_font::resolve_system_font(sf, context); longhands::system_font::resolve_system_font(sf, context);

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

@ -2014,15 +2014,10 @@ https://drafts.csswg.org/css-fonts-4/#low-level-font-variation-settings-control-
animation_value_type="ComputedValue" animation_value_type="ComputedValue"
flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER" flags="APPLIES_TO_FIRST_LETTER APPLIES_TO_FIRST_LINE APPLIES_TO_PLACEHOLDER"
spec="${variation_spec}"> spec="${variation_spec}">
use values::computed::ComputedValueAsSpecified;
use values::generics::FontSettings; use values::generics::FontSettings;
impl ComputedValueAsSpecified for SpecifiedValue {}
pub type SpecifiedValue = computed_value::T; pub type SpecifiedValue = computed_value::T;
pub mod computed_value { pub mod computed_value {
use values::generics::{FontSettings, FontSettingTagFloat}; use values::generics::{FontSettings, FontSettingTagFloat};
pub type T = FontSettings<FontSettingTagFloat>; pub type T = FontSettings<FontSettingTagFloat>;

1
components/style/values/computed/mod.rs
View file

@ -338,6 +338,7 @@ trivial_to_computed_value!(f32);
trivial_to_computed_value!(i32); trivial_to_computed_value!(i32);
trivial_to_computed_value!(u8); trivial_to_computed_value!(u8);
trivial_to_computed_value!(u16); trivial_to_computed_value!(u16);
trivial_to_computed_value!(u32);
trivial_to_computed_value!(Atom); trivial_to_computed_value!(Atom);
trivial_to_computed_value!(BorderStyle); trivial_to_computed_value!(BorderStyle);
trivial_to_computed_value!(Cursor); trivial_to_computed_value!(Cursor);

11
components/style/values/generics/mod.rs
View file

@ -129,8 +129,8 @@ impl Parse for CounterStyleOrNone {
/// ///
/// For font-feature-settings, this is a tag and an integer, /// For font-feature-settings, this is a tag and an integer,
/// for font-variation-settings this is a tag and a float /// for font-variation-settings this is a tag and a float
#[derive(Clone, Debug, Eq, PartialEq)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
#[derive(Clone, Debug, Eq, PartialEq, ToComputedValue)]
pub struct FontSettingTag<T> { pub struct FontSettingTag<T> {
/// A four-character tag, packed into a u32 (one byte per character) /// A four-character tag, packed into a u32 (one byte per character)
pub tag: u32, pub tag: u32,
@ -187,7 +187,7 @@ impl<T: Parse> Parse for FontSettingTag<T> {
/// A font settings value for font-variation-settings or font-feature-settings /// A font settings value for font-variation-settings or font-feature-settings
#[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
#[derive(Clone, Debug, Eq, PartialEq, ToCss)] #[derive(Clone, Debug, Eq, PartialEq, ToComputedValue, ToCss)]
pub enum FontSettings<T> { pub enum FontSettings<T> {
/// No settings (default) /// No settings (default)
Normal, Normal,
@ -210,16 +210,17 @@ impl<T: Parse> Parse for FontSettings<T> {
/// ///
/// Do not use this type anywhere except within FontSettings /// Do not use this type anywhere except within FontSettings
/// because it serializes with the preceding space /// because it serializes with the preceding space
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
#[derive(Clone, Copy, Debug, Eq, PartialEq, ToComputedValue)]
pub struct FontSettingTagInt(pub u32); pub struct FontSettingTagInt(pub u32);
/// A number value to be used for font-variation-settings /// A number value to be used for font-variation-settings
/// ///
/// Do not use this type anywhere except within FontSettings /// Do not use this type anywhere except within FontSettings
/// because it serializes with the preceding space /// because it serializes with the preceding space
#[derive(Clone, Debug, PartialEq)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
#[cfg_attr(feature = "gecko", derive(Animate, ComputeSquaredDistance))] #[cfg_attr(feature = "gecko", derive(Animate, ComputeSquaredDistance))]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
#[derive(Clone, Debug, PartialEq, ToComputedValue)]
pub struct FontSettingTagFloat(pub f32); pub struct FontSettingTagFloat(pub f32);
impl ToCss for FontSettingTagInt { impl ToCss for FontSettingTagInt {