mirror of
https://github.com/servo/servo.git
synced 2025-08-07 06:25:32 +01:00
style: Rustfmt recent changes.
This commit is contained in:
parent
112a68723e
commit
33d39d37a2
9 changed files with 61 additions and 50 deletions
|
@ -10,7 +10,10 @@
|
|||
use crate::values::computed::position::Position;
|
||||
use crate::values::computed::url::ComputedImageUrl;
|
||||
use crate::values::computed::{Angle, Color, Context};
|
||||
use crate::values::computed::{LengthPercentage, NonNegativeLength, NonNegativeLengthPercentage, NumberOrPercentage, ToComputedValue};
|
||||
use crate::values::computed::{
|
||||
LengthPercentage, NonNegativeLength, NonNegativeLengthPercentage, NumberOrPercentage,
|
||||
ToComputedValue,
|
||||
};
|
||||
use crate::values::generics::image::{self as generic, GradientCompatMode};
|
||||
use crate::values::specified::image::LineDirection as SpecifiedLineDirection;
|
||||
use crate::values::specified::position::{HorizontalPositionKeyword, VerticalPositionKeyword};
|
||||
|
|
|
@ -124,11 +124,7 @@ impl LengthPercentage {
|
|||
/// Returns a new `LengthPercentage`.
|
||||
#[inline]
|
||||
pub fn new(length: Length, percentage: Option<Percentage>) -> Self {
|
||||
Self::with_clamping_mode(
|
||||
length,
|
||||
percentage,
|
||||
AllowedNumericType::All,
|
||||
)
|
||||
Self::with_clamping_mode(length, percentage, AllowedNumericType::All)
|
||||
}
|
||||
|
||||
/// Returns a new `LengthPercentage` with zero length and some percentage.
|
||||
|
@ -384,11 +380,7 @@ impl LengthPercentage {
|
|||
);
|
||||
}
|
||||
|
||||
return Self::with_clamping_mode(
|
||||
self.length,
|
||||
Some(p),
|
||||
AllowedNumericType::NonNegative,
|
||||
)
|
||||
return Self::with_clamping_mode(self.length, Some(p), AllowedNumericType::NonNegative);
|
||||
}
|
||||
|
||||
Self::with_clamping_mode(
|
||||
|
|
|
@ -82,7 +82,12 @@ pub struct GenericGradient<
|
|||
Color,
|
||||
> {
|
||||
/// Gradients can be linear or radial.
|
||||
pub kind: GenericGradientKind<LineDirection, NonNegativeLength, NonNegativeLengthPercentage, Position>,
|
||||
pub kind: GenericGradientKind<
|
||||
LineDirection,
|
||||
NonNegativeLength,
|
||||
NonNegativeLengthPercentage,
|
||||
Position,
|
||||
>,
|
||||
/// The color stops and interpolation hints.
|
||||
pub items: crate::OwnedSlice<GenericGradientItem<Color, LengthPercentage>>,
|
||||
/// True if this is a repeating gradient.
|
||||
|
@ -108,11 +113,19 @@ pub enum GradientCompatMode {
|
|||
/// A gradient kind.
|
||||
#[derive(Clone, Copy, Debug, MallocSizeOf, PartialEq, ToComputedValue, ToResolvedValue, ToShmem)]
|
||||
#[repr(C, u8)]
|
||||
pub enum GenericGradientKind<LineDirection, NonNegativeLength, NonNegativeLengthPercentage, Position> {
|
||||
pub enum GenericGradientKind<
|
||||
LineDirection,
|
||||
NonNegativeLength,
|
||||
NonNegativeLengthPercentage,
|
||||
Position,
|
||||
> {
|
||||
/// A linear gradient.
|
||||
Linear(LineDirection),
|
||||
/// A radial gradient.
|
||||
Radial(GenericEndingShape<NonNegativeLength, NonNegativeLengthPercentage>, Position),
|
||||
Radial(
|
||||
GenericEndingShape<NonNegativeLength, NonNegativeLengthPercentage>,
|
||||
Position,
|
||||
),
|
||||
}
|
||||
|
||||
pub use self::GenericGradientKind as GradientKind;
|
||||
|
|
|
@ -398,14 +398,16 @@ impl Display {
|
|||
// blockify both to "block".
|
||||
#[cfg(feature = "gecko")]
|
||||
DisplayOutside::XUL => {
|
||||
if static_prefs::pref!("layout.css.xul-box-display-values.survive-blockification.enabled") {
|
||||
match self.inside() {
|
||||
DisplayInside::MozInlineBox | DisplayInside::MozBox => Display::MozBox,
|
||||
_ => Display::Block,
|
||||
if static_prefs::pref!(
|
||||
"layout.css.xul-box-display-values.survive-blockification.enabled"
|
||||
) {
|
||||
match self.inside() {
|
||||
DisplayInside::MozInlineBox | DisplayInside::MozBox => Display::MozBox,
|
||||
_ => Display::Block,
|
||||
}
|
||||
} else {
|
||||
Display::Block
|
||||
}
|
||||
} else {
|
||||
Display::Block
|
||||
}
|
||||
},
|
||||
DisplayOutside::Block | DisplayOutside::None => *self,
|
||||
#[cfg(any(feature = "servo-layout-2013", feature = "gecko"))]
|
||||
|
@ -1155,7 +1157,7 @@ fn change_bits_for_longhand(longhand: LonghandId) -> WillChangeBits {
|
|||
LonghandId::Opacity => WillChangeBits::OPACITY,
|
||||
LonghandId::Transform | LonghandId::Translate | LonghandId::Rotate | LonghandId::Scale => {
|
||||
WillChangeBits::TRANSFORM
|
||||
}
|
||||
},
|
||||
_ => WillChangeBits::empty(),
|
||||
};
|
||||
|
||||
|
|
|
@ -10,16 +10,18 @@
|
|||
use crate::custom_properties::SpecifiedValue;
|
||||
use crate::parser::{Parse, ParserContext};
|
||||
use crate::stylesheets::CorsMode;
|
||||
use crate::values::generics::NonNegative;
|
||||
use crate::values::generics::image::PaintWorklet;
|
||||
use crate::values::generics::image::{
|
||||
self as generic, Circle, Ellipse, GradientCompatMode, ShapeExtent,
|
||||
};
|
||||
use crate::values::generics::position::Position as GenericPosition;
|
||||
use crate::values::generics::NonNegative;
|
||||
use crate::values::specified::position::{HorizontalPositionKeyword, VerticalPositionKeyword};
|
||||
use crate::values::specified::position::{Position, PositionComponent, Side};
|
||||
use crate::values::specified::url::SpecifiedImageUrl;
|
||||
use crate::values::specified::{Angle, Color, Length, LengthPercentage, NonNegativeLength, NonNegativeLengthPercentage};
|
||||
use crate::values::specified::{
|
||||
Angle, Color, Length, LengthPercentage, NonNegativeLength, NonNegativeLengthPercentage,
|
||||
};
|
||||
use crate::values::specified::{Number, NumberOrPercentage, Percentage};
|
||||
use crate::Atom;
|
||||
use cssparser::{Delimiter, Parser, Token};
|
||||
|
@ -88,7 +90,8 @@ impl SpecifiedValueInfo for Gradient {
|
|||
}
|
||||
|
||||
/// A specified gradient kind.
|
||||
pub type GradientKind = generic::GradientKind<LineDirection, NonNegativeLength, NonNegativeLengthPercentage, Position>;
|
||||
pub type GradientKind =
|
||||
generic::GradientKind<LineDirection, NonNegativeLength, NonNegativeLengthPercentage, Position>;
|
||||
|
||||
/// A specified gradient line direction.
|
||||
///
|
||||
|
@ -751,7 +754,10 @@ impl EndingShape {
|
|||
}
|
||||
NonNegativeLengthPercentage::parse(context, i)?
|
||||
};
|
||||
Ok(generic::EndingShape::Ellipse(Ellipse::Radii(NonNegative(LengthPercentage::from(x)), y)))
|
||||
Ok(generic::EndingShape::Ellipse(Ellipse::Radii(
|
||||
NonNegative(LengthPercentage::from(x)),
|
||||
y,
|
||||
)))
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
@ -62,7 +62,9 @@ pub use self::length::{FontRelativeLength, Length, LengthOrNumber, NonNegativeLe
|
|||
pub use self::length::{LengthOrAuto, LengthPercentage, LengthPercentageOrAuto};
|
||||
pub use self::length::{MaxSize, Size};
|
||||
pub use self::length::{NoCalcLength, ViewportPercentageLength};
|
||||
pub use self::length::{NonNegativeLength, NonNegativeLengthPercentage, NonNegativeLengthPercentageOrAuto};
|
||||
pub use self::length::{
|
||||
NonNegativeLength, NonNegativeLengthPercentage, NonNegativeLengthPercentageOrAuto,
|
||||
};
|
||||
#[cfg(feature = "gecko")]
|
||||
pub use self::list::ListStyleType;
|
||||
pub use self::list::MozListReversed;
|
||||
|
|
|
@ -297,11 +297,7 @@ impl<S: Side> ToComputedValue for PositionComponent<S> {
|
|||
let p = Percentage(1. - length.percentage());
|
||||
let l = -length.unclamped_length();
|
||||
// We represent `<end-side> <length>` as `calc(100% - <length>)`.
|
||||
ComputedLengthPercentage::with_clamping_mode(
|
||||
l,
|
||||
Some(p),
|
||||
length.clamping_mode,
|
||||
)
|
||||
ComputedLengthPercentage::with_clamping_mode(l, Some(p), length.clamping_mode)
|
||||
},
|
||||
PositionComponent::Side(_, Some(ref length)) |
|
||||
PositionComponent::Length(ref length) => length.to_computed_value(context),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue