Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-30 16:49:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #29720 - Loirooriol:backport-D143942, r=mrobinson

Browse source 
Don't go through app-units-ratio to convert absolute lengths

This is a backport of https://phabricator.services.mozilla.com/D143942, by Emilio Cobos Álvarez.

This doesn't change behavior on its own, but the current code introduces some minor floating point error which we can avoid, and which would cause failures with the patch for #29696.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because they don't change behavior on their own.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This commit is contained in:
bors-servo 2023-05-08 01:01:51 +02:00 • committed by GitHub
commit 463e5f9d5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/values/specified/font.rs
View file

@ -15,7 +15,7 @@ use crate::values::computed::{CSSPixelLength, Context, ToComputedValue};
use crate::values::generics::font::VariationValue; use crate::values::generics::font::VariationValue;
use crate::values::generics::font::{self as generics, FeatureTagValue, FontSettings, FontTag}; use crate::values::generics::font::{self as generics, FeatureTagValue, FontSettings, FontTag};
use crate::values::generics::NonNegative; use crate::values::generics::NonNegative;
use crate::values::specified::length::{FontBaseSize, AU_PER_PT, AU_PER_PX}; use crate::values::specified::length::{FontBaseSize, PX_PER_PT};
use crate::values::specified::{AllowQuirks, Angle, Integer, LengthPercentage}; use crate::values::specified::{AllowQuirks, Angle, Integer, LengthPercentage};
use crate::values::specified::{NoCalcLength, NonNegativeNumber, Number, Percentage}; use crate::values::specified::{NoCalcLength, NonNegativeNumber, Number, Percentage};
use crate::values::CustomIdent; use crate::values::CustomIdent;
@ -2287,7 +2287,7 @@ impl MozScriptMinSize {
#[inline] #[inline]
/// Calculate initial value of -moz-script-min-size. /// Calculate initial value of -moz-script-min-size.
pub fn get_initial_value() -> Length { pub fn get_initial_value() -> Length {
Length::new(DEFAULT_SCRIPT_MIN_SIZE_PT as f32 * (AU_PER_PT / AU_PER_PX)) Length::new(DEFAULT_SCRIPT_MIN_SIZE_PT as f32 * PX_PER_PT)
} }
} }

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

@ -32,20 +32,18 @@ pub use super::image::Image;
pub use super::image::{EndingShape as GradientEndingShape, Gradient}; pub use super::image::{EndingShape as GradientEndingShape, Gradient};
pub use crate::values::specified::calc::CalcLengthPercentage; pub use crate::values::specified::calc::CalcLengthPercentage;
/// Number of app units per pixel /// Number of pixels per inch
pub const AU_PER_PX: CSSFloat = 60.; pub const PX_PER_IN: CSSFloat = 96.;
/// Number of app units per inch /// Number of pixels per centimeter
pub const AU_PER_IN: CSSFloat = AU_PER_PX * 96.; pub const PX_PER_CM: CSSFloat = PX_PER_IN / 2.54;
/// Number of app units per centimeter /// Number of pixels per millimeter
pub const AU_PER_CM: CSSFloat = AU_PER_IN / 2.54; pub const PX_PER_MM: CSSFloat = PX_PER_IN / 25.4;
/// Number of app units per millimeter /// Number of pixels per quarter
pub const AU_PER_MM: CSSFloat = AU_PER_IN / 25.4; pub const PX_PER_Q: CSSFloat = PX_PER_MM / 4.;
/// Number of app units per quarter /// Number of pixels per point
pub const AU_PER_Q: CSSFloat = AU_PER_MM / 4.; pub const PX_PER_PT: CSSFloat = PX_PER_IN / 72.;
/// Number of app units per point /// Number of pixels per pica
pub const AU_PER_PT: CSSFloat = AU_PER_IN / 72.; pub const PX_PER_PC: CSSFloat = PX_PER_PT * 12.;
/// Number of app units per pica
pub const AU_PER_PC: CSSFloat = AU_PER_PT * 12.;
/// A font relative length. /// A font relative length.
#[derive(Clone, Copy, Debug, MallocSizeOf, PartialEq, ToCss, ToShmem)] #[derive(Clone, Copy, Debug, MallocSizeOf, PartialEq, ToCss, ToShmem)]
@ -407,12 +405,12 @@ impl AbsoluteLength {
let pixel = match *self { let pixel = match *self {
AbsoluteLength::Px(value) => value, AbsoluteLength::Px(value) => value,
AbsoluteLength::In(value) => value * (AU_PER_IN / AU_PER_PX), AbsoluteLength::In(value) => value * PX_PER_IN,
AbsoluteLength::Cm(value) => value * (AU_PER_CM / AU_PER_PX), AbsoluteLength::Cm(value) => value * PX_PER_CM,
AbsoluteLength::Mm(value) => value * (AU_PER_MM / AU_PER_PX), AbsoluteLength::Mm(value) => value * PX_PER_MM,
AbsoluteLength::Q(value) => value * (AU_PER_Q / AU_PER_PX), AbsoluteLength::Q(value) => value * PX_PER_Q,
AbsoluteLength::Pt(value) => value * (AU_PER_PT / AU_PER_PX), AbsoluteLength::Pt(value) => value * PX_PER_PT,
AbsoluteLength::Pc(value) => value * (AU_PER_PC / AU_PER_PX), AbsoluteLength::Pc(value) => value * PX_PER_PC,
}; };
pixel.min(f32::MAX).max(f32::MIN) pixel.min(f32::MAX).max(f32::MIN)
} }