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

Fix Servo build.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2019-01-07 00:56:59 +01:00
parent 4c1076a9ac
commit 97bd8fc280
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/layout/display_list/border.rs
View file

@ -14,6 +14,7 @@ use style::values::computed::{BorderCornerRadius, BorderImageWidth};
use style::values::computed::{BorderImageSideWidth, LengthOrNumber}; use style::values::computed::{BorderImageSideWidth, LengthOrNumber};
use style::values::generics::border::BorderImageSideWidth as GenericBorderImageSideWidth; use style::values::generics::border::BorderImageSideWidth as GenericBorderImageSideWidth;
use style::values::generics::rect::Rect as StyleRect; use style::values::generics::rect::Rect as StyleRect;
use style::values::generics::NonNegative;
use style::values::Either; use style::values::Either;
use webrender_api::{BorderRadius, BorderSide, BorderStyle, ColorF}; use webrender_api::{BorderRadius, BorderSide, BorderStyle, ColorF};
use webrender_api::{LayoutSideOffsets, LayoutSize, NormalBorder}; use webrender_api::{LayoutSideOffsets, LayoutSize, NormalBorder};
@ -163,7 +164,7 @@ fn side_image_width(
) -> f32 { ) -> f32 {
match border_image_width { match border_image_width {
GenericBorderImageSideWidth::Length(v) => v.to_used_value(total_length).to_f32_px(), GenericBorderImageSideWidth::Length(v) => v.to_used_value(total_length).to_f32_px(),
GenericBorderImageSideWidth::Number(x) => border_width * x, GenericBorderImageSideWidth::Number(x) => border_width * x.0,
GenericBorderImageSideWidth::Auto => border_width, GenericBorderImageSideWidth::Auto => border_width,
} }
} }
@ -181,15 +182,15 @@ pub fn image_width(
) )
} }
fn resolve_percentage(value: NumberOrPercentage, length: i32) -> i32 { fn resolve_percentage(value: NonNegative<NumberOrPercentage>, length: i32) -> i32 {
match value { match value.0 {
NumberOrPercentage::Percentage(p) => (p.0 * length as f32).round() as i32, NumberOrPercentage::Percentage(p) => (p.0 * length as f32).round() as i32,
NumberOrPercentage::Number(n) => n.round() as i32, NumberOrPercentage::Number(n) => n.round() as i32,
} }
} }
pub fn image_slice( pub fn image_slice(
border_image_slice: &StyleRect<NumberOrPercentage>, border_image_slice: &StyleRect<NonNegative<NumberOrPercentage>>,
width: i32, width: i32,
height: i32, height: i32,
) -> SideOffsets2D<i32> { ) -> SideOffsets2D<i32> {

6
components/script/dom/element.rs
View file

@ -128,6 +128,7 @@ use style::selector_parser::{
}; };
use style::shared_lock::{Locked, SharedRwLock}; use style::shared_lock::{Locked, SharedRwLock};
use style::thread_state; use style::thread_state;
use style::values::generics::NonNegative;
use style::values::{computed, specified}; use style::values::{computed, specified};
use style::values::{CSSFloat, Either}; use style::values::{CSSFloat, Either};
use style::CaseSensitivityExt; use style::CaseSensitivityExt;
@ -847,8 +848,9 @@ impl LayoutElementHelpers for LayoutDom<Element> {
}; };
if let Some(border) = border { if let Some(border) = border {
let width_value = let width_value = specified::BorderSideWidth::Length(NonNegative(
specified::BorderSideWidth::Length(specified::Length::from_px(border as f32)); specified::Length::from_px(border as f32),
));
hints.push(from_declaration( hints.push(from_declaration(
shared_lock, shared_lock,
PropertyDeclaration::BorderTopWidth(width_value.clone()), PropertyDeclaration::BorderTopWidth(width_value.clone()),