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

Auto merge of #21982 - emilio:gecko-sync, r=emilio

Browse source 
style: Sync changes from mozilla-central.

See each individual commit for details.

https://bugzilla.mozilla.org/show_bug.cgi?id=1500260

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21982)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-10-18 23:58:28 -04:00 • committed by GitHub
commit 91282778e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 799 additions and 902 deletions
Download patch file Download diff file Expand all files Collapse all files

54
tests/unit/style/properties/serialization.rs
View file

@ -611,60 +611,6 @@ mod shorthand_serialization {
}
}
mod transform {
pub use super::*;
use style::values::generics::transform::TransformOperation;
use style::values::specified::{Angle, Number};
use style::values::specified::transform::TransformOperation as SpecifiedOperation;
#[test]
fn should_serialize_none_correctly() {
use style::properties::longhands::transform;
assert_roundtrip_with_context!(transform::parse, "none");
}
#[inline(always)]
fn validate_serialization(op: &SpecifiedOperation, expected_string: &'static str) {
let css_string = op.to_css_string();
assert_eq!(css_string, expected_string);
}
#[test]
fn transform_scale() {
validate_serialization(&TransformOperation::Scale(Number::new(1.3), None), "scale(1.3)");
validate_serialization(
&TransformOperation::Scale(Number::new(2.0), Some(Number::new(2.0))),
"scale(2, 2)");
validate_serialization(&TransformOperation::ScaleX(Number::new(42.0)), "scaleX(42)");
validate_serialization(&TransformOperation::ScaleY(Number::new(0.3)), "scaleY(0.3)");
validate_serialization(&TransformOperation::ScaleZ(Number::new(1.0)), "scaleZ(1)");
validate_serialization(
&TransformOperation::Scale3D(Number::new(4.0), Number::new(5.0), Number::new(6.0)),
"scale3d(4, 5, 6)");
}
#[test]
fn transform_skew() {
validate_serialization(
&TransformOperation::Skew(Angle::from_degrees(42.3, false), None),
"skew(42.3deg)");
validate_serialization(
&TransformOperation::Skew(Angle::from_gradians(-50.0, false), Some(Angle::from_turns(0.73, false))),
"skew(-50grad, 0.73turn)");
validate_serialization(
&TransformOperation::SkewX(Angle::from_radians(0.31, false)), "skewX(0.31rad)");
}
#[test]
fn transform_rotate() {
validate_serialization(
&TransformOperation::Rotate(Angle::from_turns(35.0, false)),
"rotate(35turn)"
)
}
}
mod quotes {
pub use super::*;

2
tests/wpt/metadata/css/css-conditional/at-supports-040.html.ini
View file

@ -1,2 +0,0 @@
[at-supports-040.html]
expected: FAIL

4
tests/wpt/metadata/css/cssom/CSS.html.ini
View file

@ -1,4 +0,0 @@
[CSS.html]
[CSS.supports, selector function]
expected: FAIL

2
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -26166,7 +26166,7 @@
"reftest"
],
"css/transform_skew_ref.html": [
"caf92ca6f50d1cfe27f9202ebf79d76dead03ba0",
"b6ef9bb8fe9c129b02f5f3213865673a42638190",
"support"
],
"css/transform_stacking_context_a.html": [

6
tests/wpt/mozilla/tests/css/transform_skew_ref.html
View file

@ -17,15 +17,15 @@ div>div {
}
.transformed1_ref {
transform: matrix(1, 0, 0.25534192122, 1, 0, 0);
transform: matrix(1, 0, 0.255342, 1, 0, 0);
}
.transformed2_ref {
transform: matrix(1, 0.54630248984, 0, 1, 0, 0);
transform: matrix(1, 0.546302, 0, 1, 0, 0);
}
.transformed3_ref {
transform: matrix(1, 0.54630248984, 0.25534192122, 1, 0, 0);
transform: matrix(1, 0.546302, 0.255342, 1, 0, 0);
}
</style>