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

Introduce CSSPixelLength and update NonNegativeLength.

Browse source 
First, we define computed::CSSPixelLength which contains a CSSFloat, a
pixel value, and then we replace computed::Length with CSSPixelLength.
Therefore, the |ComputedValue| of NoCalcLength, AbsoluteLength,
FontRelativeLength, ViewportPercentageLength, CharacterWidth, and
PhysicalLength is CSSPixelLength.

Besides, we drop NonNegativeAu, and replace computed::NonNegativeLength
with NonNegative<computed::Length>. (i.e. NonNegative<CSSPixelLength>)
This commit is contained in:
Boris Chiou 2017-09-13 14:26:51 +08:00
parent cad3aff508
commit a949e2a057
40 changed files with 502 additions and 406 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/style/gecko_bindings/sugar/ns_css_shadow_item.rs
View file

@ -15,7 +15,7 @@ impl nsCSSShadowItem {
#[inline]
pub fn set_from_box_shadow(&mut self, shadow: BoxShadow) {
self.set_from_simple_shadow(shadow.base);
self.mSpread = shadow.spread.0;
self.mSpread = shadow.spread.to_i32_au();
self.mInset = shadow.inset;
}
@ -24,7 +24,7 @@ impl nsCSSShadowItem {
pub fn to_box_shadow(&self) -> BoxShadow {
BoxShadow {
base: self.extract_simple_shadow(),
spread: Au(self.mSpread),
spread: Au(self.mSpread).into(),
inset: self.mInset,
}
}
@ -32,9 +32,9 @@ impl nsCSSShadowItem {
/// Sets this item from the given simple shadow.
#[inline]
pub fn set_from_simple_shadow(&mut self, shadow: SimpleShadow) {
self.mXOffset = shadow.horizontal.0;
self.mYOffset = shadow.vertical.0;
self.mRadius = shadow.blur.value();
self.mXOffset = shadow.horizontal.to_i32_au();
self.mYOffset = shadow.vertical.to_i32_au();
self.mRadius = shadow.blur.0.to_i32_au();
self.mSpread = 0;
self.mInset = false;
if let Some(color) = shadow.color {
@ -62,8 +62,8 @@ impl nsCSSShadowItem {
fn extract_simple_shadow(&self) -> SimpleShadow {
SimpleShadow {
color: self.extract_color(),
horizontal: Au(self.mXOffset),
vertical: Au(self.mYOffset),
horizontal: Au(self.mXOffset).into(),
vertical: Au(self.mYOffset).into(),
blur: Au(self.mRadius).into(),
}
}