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

style: Rename background::RepeatKeyword and border::RepeatKeyword.

Browse source
This commit is contained in:
Mauricio Collares 2018-01-01 16:02:17 -03:00 • committed by Emilio Cobos Álvarez
parent 50b517d0db
commit 8e411105ce
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
8 changed files with 55 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/layout/display_list/background.rs
View file

@ -21,7 +21,7 @@ use style::values::generics::background::BackgroundSize;
use style::values::generics::image::{Circle, Ellipse, ShapeExtent};
use style::values::generics::image::EndingShape as GenericEndingShape;
use style::values::generics::image::GradientItem as GenericGradientItem;
use style::values::specified::background::RepeatKeyword;
use style::values::specified::background::BackgroundRepeatKeyword;
use style::values::specified::position::{X, Y};
use webrender_api::{ExtendMode, GradientStop};
@ -176,7 +176,7 @@ fn tile_image(position: &mut Au, size: &mut Au, absolute_anchor_origin: Au, imag
///
/// This is done separately for both axes because the repeat keywords may differ.
pub fn tile_image_axis(
repeat: RepeatKeyword,
repeat: BackgroundRepeatKeyword,
position: &mut Au,
size: &mut Au,
tile_size: &mut Au,
@ -187,16 +187,16 @@ pub fn tile_image_axis(
) {
let absolute_anchor_origin = *position + offset;
match repeat {
RepeatKeyword::NoRepeat => {
BackgroundRepeatKeyword::NoRepeat => {
*position += offset;
*size = *tile_size;
},
RepeatKeyword::Repeat => {
BackgroundRepeatKeyword::Repeat => {
*position = clip_origin;
*size = clip_size;
tile_image(position, size, absolute_anchor_origin, *tile_size);
},
RepeatKeyword::Space => {
BackgroundRepeatKeyword::Space => {
tile_image_spaced(
position,
size,
@ -209,7 +209,7 @@ pub fn tile_image_axis(
*size = clip_size;
tile_image(position, size, absolute_anchor_origin, combined_tile_size);
},
RepeatKeyword::Round => {
BackgroundRepeatKeyword::Round => {
tile_image_round(position, size, absolute_anchor_origin, tile_size);
*position = clip_origin;
*size = clip_size;

1
components/layout/display_list/builder.rs
View file

@ -69,7 +69,6 @@ use style::values::computed::effects::SimpleShadow;
use style::values::computed::pointing::Cursor;
use style::values::generics::background::BackgroundSize;
use style::values::generics::image::{GradientKind, Image, PaintWorklet};
use style::values::specified::border::RepeatKeyword;
use style_traits::CSSPixel;
use style_traits::ToCss;
use style_traits::cursor::CursorKind;

13
components/layout/display_list/conversions.rs
View file

@ -7,10 +7,10 @@ use euclid::{Point2D, Rect, SideOffsets2D, Size2D, Vector2D};
use style::computed_values::image_rendering::T as ImageRendering;
use style::computed_values::mix_blend_mode::T as MixBlendMode;
use style::computed_values::transform_style::T as TransformStyle;
use style::properties::longhands::border_image_repeat::RepeatKeyword;
use style::values::RGBA;
use style::values::computed::{BorderStyle, Filter};
use style::values::generics::effects::Filter as GenericFilter;
use style::values::specified::border::BorderImageRepeatKeyword;
use webrender_api as wr;
pub trait ToLayout {
@ -152,14 +152,15 @@ impl ToLayout for Vector2D<Au> {
}
}
impl ToLayout for RepeatKeyword {
impl ToLayout for BorderImageRepeatKeyword {
type Type = wr::RepeatMode;
fn to_layout(&self) -> Self::Type {
match *self {
RepeatKeyword::Stretch => wr::RepeatMode::Stretch,
RepeatKeyword::Repeat => wr::RepeatMode::Repeat,
RepeatKeyword::Round => wr::RepeatMode::Round,
RepeatKeyword::Space => wr::RepeatMode::Space,
BorderImageRepeatKeyword::Stretch => wr::RepeatMode::Stretch,
BorderImageRepeatKeyword::Repeat => wr::RepeatMode::Repeat,
BorderImageRepeatKeyword::Round => wr::RepeatMode::Round,
BorderImageRepeatKeyword::Space => wr::RepeatMode::Space,
}
}
}