mirror of
https://github.com/servo/servo.git
synced 2025-08-13 09:25:32 +01:00
style: Respect calc for percentages.
This commit is contained in:
parent
465e6f14fe
commit
310be02ba8
28 changed files with 308 additions and 176 deletions
|
@ -8,7 +8,7 @@ use style::properties::animated_properties::{Animatable, IntermediateRGBA};
|
|||
use style::properties::longhands::transform::computed_value::ComputedOperation as TransformOperation;
|
||||
use style::properties::longhands::transform::computed_value::T as TransformList;
|
||||
use style::values::animated::ToAnimatedValue;
|
||||
use style::values::specified::length::Percentage;
|
||||
use style::values::computed::length::Percentage;
|
||||
|
||||
fn interpolate_rgba(from: RGBA, to: RGBA, progress: f64) -> RGBA {
|
||||
let from = from.to_animated_value();
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
use app_units::Au;
|
||||
use style::attr::{AttrValue, LengthOrPercentageOrAuto, parse_length};
|
||||
use style::values::computed::CalcLengthOrPercentage;
|
||||
use style::values::specified::length::Percentage;
|
||||
use style::values::computed::length::Percentage;
|
||||
|
||||
#[test]
|
||||
fn test_length_calc() {
|
||||
|
|
|
@ -358,16 +358,16 @@ mod shorthand_serialization {
|
|||
fn border_radius_should_serialize_correctly() {
|
||||
let mut properties = Vec::new();
|
||||
properties.push(PropertyDeclaration::BorderTopLeftRadius(Box::new(BorderCornerRadius::new(
|
||||
Percentage(0.01).into(), Percentage(0.05).into()
|
||||
Percentage::new(0.01).into(), Percentage::new(0.05).into()
|
||||
))));
|
||||
properties.push(PropertyDeclaration::BorderTopRightRadius(Box::new(BorderCornerRadius::new(
|
||||
Percentage(0.02).into(), Percentage(0.06).into()
|
||||
Percentage::new(0.02).into(), Percentage::new(0.06).into()
|
||||
))));
|
||||
properties.push(PropertyDeclaration::BorderBottomRightRadius(Box::new(BorderCornerRadius::new(
|
||||
Percentage(0.03).into(), Percentage(0.07).into()
|
||||
Percentage::new(0.03).into(), Percentage::new(0.07).into()
|
||||
))));
|
||||
properties.push(PropertyDeclaration::BorderBottomLeftRadius(Box::new(BorderCornerRadius::new(
|
||||
Percentage(0.04).into(), Percentage(0.08).into()
|
||||
Percentage::new(0.04).into(), Percentage::new(0.08).into()
|
||||
))));
|
||||
|
||||
let serialization = shorthand_properties_to_string(properties);
|
||||
|
@ -563,7 +563,7 @@ mod shorthand_serialization {
|
|||
let grow = Number::new(2f32);
|
||||
let shrink = Number::new(3f32);
|
||||
let basis =
|
||||
FlexBasis::Length(Percentage(0.5f32).into());
|
||||
FlexBasis::Length(Percentage::new(0.5f32).into());
|
||||
|
||||
properties.push(PropertyDeclaration::FlexGrow(grow));
|
||||
properties.push(PropertyDeclaration::FlexShrink(shrink));
|
||||
|
|
|
@ -26,7 +26,8 @@ use style::stylesheets::{Origin, Namespaces};
|
|||
use style::stylesheets::{Stylesheet, StylesheetContents, NamespaceRule, CssRule, CssRules, StyleRule, KeyframesRule};
|
||||
use style::stylesheets::keyframes_rule::{Keyframe, KeyframeSelector, KeyframePercentage};
|
||||
use style::values::{KeyframesName, CustomIdent};
|
||||
use style::values::specified::{LengthOrPercentageOrAuto, Percentage, PositionComponent};
|
||||
use style::values::computed::Percentage;
|
||||
use style::values::specified::{LengthOrPercentageOrAuto, PositionComponent};
|
||||
|
||||
pub fn block_from<I>(iterable: I) -> PropertyDeclarationBlock
|
||||
where I: IntoIterator<Item=(PropertyDeclaration, Importance)> {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue