Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-17 19:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
style: Sync changes from mozilla-central.

See each individual commit for details.

<!-- 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/21735)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-09-18 06:02:00 -04:00 • committed by GitHub
commit bdf450336e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 1212 additions and 923 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/unit/style/custom_properties.rs
View file

@ -5,7 +5,7 @@
use cssparser::{Parser, ParserInput};
use servo_arc::Arc;
use style::custom_properties::{Name, SpecifiedValue, CustomPropertiesMap, CustomPropertiesBuilder};
use style::properties::DeclaredValue;
use style::properties::CustomDeclarationValue;
use test::{self, Bencher};
fn cascade(
@ -21,7 +21,7 @@ fn cascade(
let mut builder = CustomPropertiesBuilder::new(inherited);
for &(ref name, ref val) in &values {
builder.cascade(name, DeclaredValue::Value(val));
builder.cascade(name, &CustomDeclarationValue::Value(val.clone()));
}
builder.build()

4
tests/unit/style/stylesheets.rs
View file

@ -18,7 +18,7 @@ use style::context::QuirksMode;
use style::error_reporting::{ParseErrorReporter, ContextualParseError};
use style::media_queries::MediaList;
use style::properties::{CSSWideKeyword, CustomDeclaration};
use style::properties::{DeclaredValueOwned, Importance};
use style::properties::{CustomDeclarationValue, Importance};
use style::properties::{PropertyDeclaration, PropertyDeclarationBlock};
use style::properties::longhands::{self, animation_timing_function};
use style::shared_lock::SharedRwLock;
@ -113,7 +113,7 @@ fn test_parse_stylesheet() {
(
PropertyDeclaration::Custom(CustomDeclaration {
name: Atom::from("a"),
value: DeclaredValueOwned::CSSWideKeyword(CSSWideKeyword::Inherit),
value: CustomDeclarationValue::CSSWideKeyword(CSSWideKeyword::Inherit),
}),
Importance::Important,
),