mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
parent
a9aa50683f
commit
5c408d2be9
39 changed files with 397 additions and 377 deletions
|
@ -2,7 +2,7 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use geom::size::TypedSize2D;
|
||||
use geom::size::Size2D;
|
||||
use style::stylesheets::{Stylesheet, CSSRuleIteratorExt};
|
||||
use style::stylesheets::Origin;
|
||||
use style::media_queries::*;
|
||||
|
@ -349,7 +349,7 @@ fn test_mq_malformed_expressions() {
|
|||
fn test_matching_simple() {
|
||||
let device = Device {
|
||||
media_type: MediaType::Screen,
|
||||
viewport_size: TypedSize2D(200.0, 100.0),
|
||||
viewport_size: Size2D::typed(200.0, 100.0),
|
||||
};
|
||||
|
||||
media_query_test(&device, "@media not all { a { color: red; } }", 0);
|
||||
|
@ -368,7 +368,7 @@ fn test_matching_simple() {
|
|||
fn test_matching_width() {
|
||||
let device = Device {
|
||||
media_type: MediaType::Screen,
|
||||
viewport_size: TypedSize2D(200.0, 100.0),
|
||||
viewport_size: Size2D::typed(200.0, 100.0),
|
||||
};
|
||||
|
||||
media_query_test(&device, "@media { a { color: red; } }", 1);
|
||||
|
@ -412,7 +412,7 @@ fn test_matching_width() {
|
|||
fn test_matching_invalid() {
|
||||
let device = Device {
|
||||
media_type: MediaType::Screen,
|
||||
viewport_size: TypedSize2D(200.0, 100.0),
|
||||
viewport_size: Size2D::typed(200.0, 100.0),
|
||||
};
|
||||
|
||||
media_query_test(&device, "@media fridge { a { color: red; } }", 0);
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use cssparser::Parser;
|
||||
use geom::size::TypedSize2D;
|
||||
use geom::size::Size2D;
|
||||
use geom::scale_factor::ScaleFactor;
|
||||
use style::media_queries::{Device, MediaType};
|
||||
use style::parser::ParserContext;
|
||||
|
@ -51,7 +51,7 @@ macro_rules! assert_decl_len {
|
|||
|
||||
#[test]
|
||||
fn empty_viewport_rule() {
|
||||
let device = Device::new(MediaType::Screen, TypedSize2D(800., 600.));
|
||||
let device = Device::new(MediaType::Screen, Size2D::typed(800., 600.));
|
||||
|
||||
test_viewport_rule("@viewport {}", &device, |declarations, css| {
|
||||
println!("{}", css);
|
||||
|
@ -74,7 +74,7 @@ macro_rules! assert_decl_eq {
|
|||
|
||||
#[test]
|
||||
fn simple_viewport_rules() {
|
||||
let device = Device::new(MediaType::Screen, TypedSize2D(800., 600.));
|
||||
let device = Device::new(MediaType::Screen, Size2D::typed(800., 600.));
|
||||
|
||||
test_viewport_rule("@viewport { width: auto; height: auto;\
|
||||
zoom: auto; min-zoom: 0; max-zoom: 200%;\
|
||||
|
@ -107,7 +107,7 @@ fn simple_viewport_rules() {
|
|||
|
||||
#[test]
|
||||
fn cascading_within_viewport_rule() {
|
||||
let device = Device::new(MediaType::Screen, TypedSize2D(800., 600.));
|
||||
let device = Device::new(MediaType::Screen, Size2D::typed(800., 600.));
|
||||
|
||||
// normal order of appearance
|
||||
test_viewport_rule("@viewport { min-width: 200px; min-width: auto; }",
|
||||
|
@ -172,7 +172,7 @@ fn cascading_within_viewport_rule() {
|
|||
|
||||
#[test]
|
||||
fn multiple_stylesheets_cascading() {
|
||||
let device = Device::new(MediaType::Screen, TypedSize2D(800., 600.));
|
||||
let device = Device::new(MediaType::Screen, Size2D::typed(800., 600.));
|
||||
|
||||
let stylesheets = vec![
|
||||
stylesheet!("@viewport { min-width: 100px; min-height: 100px; zoom: 1; }", UserAgent),
|
||||
|
@ -217,11 +217,11 @@ fn constrain_viewport() {
|
|||
}
|
||||
}
|
||||
|
||||
let initial_viewport = TypedSize2D(800., 600.);
|
||||
let initial_viewport = Size2D::typed(800., 600.);
|
||||
assert_eq!(ViewportConstraints::maybe_new(initial_viewport, from_css!("")),
|
||||
None);
|
||||
|
||||
let initial_viewport = TypedSize2D(800., 600.);
|
||||
let initial_viewport = Size2D::typed(800., 600.);
|
||||
assert_eq!(ViewportConstraints::maybe_new(initial_viewport, from_css!("width: 320px auto")),
|
||||
Some(ViewportConstraints {
|
||||
size: initial_viewport,
|
||||
|
@ -234,10 +234,10 @@ fn constrain_viewport() {
|
|||
orientation: Orientation::Auto
|
||||
}));
|
||||
|
||||
let initial_viewport = TypedSize2D(200., 150.);
|
||||
let initial_viewport = Size2D::typed(200., 150.);
|
||||
assert_eq!(ViewportConstraints::maybe_new(initial_viewport, from_css!("width: 320px auto")),
|
||||
Some(ViewportConstraints {
|
||||
size: TypedSize2D(320., 240.),
|
||||
size: Size2D::typed(320., 240.),
|
||||
|
||||
initial_zoom: ScaleFactor::new(1.),
|
||||
min_zoom: None,
|
||||
|
@ -247,7 +247,7 @@ fn constrain_viewport() {
|
|||
orientation: Orientation::Auto
|
||||
}));
|
||||
|
||||
let initial_viewport = TypedSize2D(800., 600.);
|
||||
let initial_viewport = Size2D::typed(800., 600.);
|
||||
assert_eq!(ViewportConstraints::maybe_new(initial_viewport, from_css!("width: 320px auto")),
|
||||
Some(ViewportConstraints {
|
||||
size: initial_viewport,
|
||||
|
@ -260,7 +260,7 @@ fn constrain_viewport() {
|
|||
orientation: Orientation::Auto
|
||||
}));
|
||||
|
||||
let initial_viewport = TypedSize2D(800., 600.);
|
||||
let initial_viewport = Size2D::typed(800., 600.);
|
||||
assert_eq!(ViewportConstraints::maybe_new(initial_viewport, from_css!("width: 800px; height: 600px;\
|
||||
zoom: 1;\
|
||||
user-zoom: zoom;\
|
||||
|
|
|
@ -24,7 +24,7 @@ fn modes() -> [WritingMode; 10] {
|
|||
|
||||
#[test]
|
||||
fn test_size_round_trip() {
|
||||
let physical = Size2D(1u32, 2u32);
|
||||
let physical = Size2D::new(1u32, 2u32);
|
||||
for &mode in modes().iter() {
|
||||
let logical = LogicalSize::from_physical(mode, physical);
|
||||
assert!(logical.to_physical(mode) == physical);
|
||||
|
@ -35,8 +35,8 @@ fn test_size_round_trip() {
|
|||
|
||||
#[test]
|
||||
fn test_point_round_trip() {
|
||||
let physical = Point2D(1u32, 2u32);
|
||||
let container = Size2D(100, 200);
|
||||
let physical = Point2D::new(1u32, 2u32);
|
||||
let container = Size2D::new(100, 200);
|
||||
for &mode in modes().iter() {
|
||||
let logical = LogicalPoint::from_physical(mode, physical, container);
|
||||
assert!(logical.to_physical(mode, container) == physical);
|
||||
|
@ -60,8 +60,8 @@ fn test_margin_round_trip() {
|
|||
|
||||
#[test]
|
||||
fn test_rect_round_trip() {
|
||||
let physical = Rect(Point2D(1u32, 2u32), Size2D(3u32, 4u32));
|
||||
let container = Size2D(100, 200);
|
||||
let physical = Rect::new(Point2D::new(1u32, 2u32), Size2D::new(3u32, 4u32));
|
||||
let container = Size2D::new(100, 200);
|
||||
for &mode in modes().iter() {
|
||||
let logical = LogicalRect::from_physical(mode, physical, container);
|
||||
assert!(logical.to_physical(mode, container) == physical);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue