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

Auto merge of #16597 - Manishearth:stylo-overflow, r=emilio

Browse source 
stylo: support all overflow values

overflow:clip doesn't exist, it's just called clip internally. Renamed, and added the other missing values.

I also removed the overflow newtype -- no need for extra code bloat, and it's not protecting us from much.

<!-- 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/16597)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-04-25 15:59:13 -05:00 • committed by GitHub
commit cd8af86244
10 changed files with 63 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,8 +16,7 @@ use stylesheets::block_from;
#[test]
fn property_declaration_block_should_serialize_correctly() {
use style::properties::longhands::overflow_x::SpecifiedValue as OverflowXValue;
use style::properties::longhands::overflow_y::SpecifiedValue as OverflowYContainer;
use style::properties::longhands::overflow_x::SpecifiedValue as OverflowValue;
let declarations = vec![
(PropertyDeclaration::Width(
@ -37,11 +36,11 @@ fn property_declaration_block_should_serialize_correctly() {
Importance::Normal),
(PropertyDeclaration::OverflowX(
OverflowXValue::auto),
OverflowValue::auto),
Importance::Normal),
(PropertyDeclaration::OverflowY(
OverflowYContainer(OverflowXValue::auto)),
OverflowValue::auto),
Importance::Normal),
];
@ -68,18 +67,15 @@ mod shorthand_serialization {
mod overflow {
pub use super::*;
use style::properties::longhands::overflow_x::SpecifiedValue as OverflowXValue;
use style::properties::longhands::overflow_y::SpecifiedValue as OverflowYContainer;
use style::properties::longhands::overflow_x::SpecifiedValue as OverflowValue;
#[test]
fn equal_overflow_properties_should_serialize_to_single_value() {
let mut properties = Vec::new();
let overflow_x = OverflowXValue::auto;
properties.push(PropertyDeclaration::OverflowX(overflow_x));
let overflow_y = OverflowYContainer(OverflowXValue::auto);
properties.push(PropertyDeclaration::OverflowY(overflow_y));
let overflow = OverflowValue::auto;
properties.push(PropertyDeclaration::OverflowX(overflow));
properties.push(PropertyDeclaration::OverflowY(overflow));
let serialization = shorthand_properties_to_string(properties);
assert_eq!(serialization, "overflow: auto;");
@ -89,10 +85,10 @@ mod shorthand_serialization {
fn different_overflow_properties_should_serialize_to_two_values() {
let mut properties = Vec::new();
let overflow_x = OverflowXValue::scroll;
let overflow_x = OverflowValue::scroll;
properties.push(PropertyDeclaration::OverflowX(overflow_x));
let overflow_y = OverflowYContainer(OverflowXValue::auto);
let overflow_y = OverflowValue::auto;
properties.push(PropertyDeclaration::OverflowY(overflow_y));
let serialization = shorthand_properties_to_string(properties);