mirror of
https://github.com/servo/servo.git
synced 2025-08-05 21:50:18 +01:00
Update to euclid 0.8
This commit is contained in:
parent
b7facf41cb
commit
6259df5e2d
56 changed files with 538 additions and 558 deletions
|
@ -12,7 +12,7 @@ doctest = false
|
|||
[dependencies]
|
||||
app_units = "0.2.5"
|
||||
cssparser = {version = "0.5.4", features = ["heap_size"]}
|
||||
euclid = "0.7.1"
|
||||
euclid = "0.8.2"
|
||||
rustc-serialize = "0.3"
|
||||
selectors = {version = "0.8", features = ["heap_size"]}
|
||||
string_cache = {version = "0.2", features = ["heap_size"]}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
use app_units::Au;
|
||||
use cssparser::{Parser, SourcePosition};
|
||||
use euclid::size::Size2D;
|
||||
use euclid::size::TypedSize2D;
|
||||
use std::borrow::ToOwned;
|
||||
use style::error_reporting::ParseErrorReporter;
|
||||
use style::media_queries::*;
|
||||
|
@ -362,7 +362,7 @@ fn test_mq_malformed_expressions() {
|
|||
fn test_matching_simple() {
|
||||
let device = Device {
|
||||
media_type: MediaType::Screen,
|
||||
viewport_size: Size2D::typed(200.0, 100.0),
|
||||
viewport_size: TypedSize2D::new(200.0, 100.0),
|
||||
};
|
||||
|
||||
media_query_test(&device, "@media not all { a { color: red; } }", 0);
|
||||
|
@ -381,7 +381,7 @@ fn test_matching_simple() {
|
|||
fn test_matching_width() {
|
||||
let device = Device {
|
||||
media_type: MediaType::Screen,
|
||||
viewport_size: Size2D::typed(200.0, 100.0),
|
||||
viewport_size: TypedSize2D::new(200.0, 100.0),
|
||||
};
|
||||
|
||||
media_query_test(&device, "@media { a { color: red; } }", 1);
|
||||
|
@ -425,7 +425,7 @@ fn test_matching_width() {
|
|||
fn test_matching_invalid() {
|
||||
let device = Device {
|
||||
media_type: MediaType::Screen,
|
||||
viewport_size: Size2D::typed(200.0, 100.0),
|
||||
viewport_size: TypedSize2D::new(200.0, 100.0),
|
||||
};
|
||||
|
||||
media_query_test(&device, "@media fridge { a { color: red; } }", 0);
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
use cssparser::Parser;
|
||||
use euclid::scale_factor::ScaleFactor;
|
||||
use euclid::size::Size2D;
|
||||
use euclid::size::TypedSize2D;
|
||||
use media_queries::CSSErrorReporterTest;
|
||||
use style::error_reporting::ParseErrorReporter;
|
||||
use style::media_queries::{Device, MediaType};
|
||||
|
@ -84,7 +84,7 @@ macro_rules! viewport_length {
|
|||
|
||||
#[test]
|
||||
fn empty_viewport_rule() {
|
||||
let device = Device::new(MediaType::Screen, Size2D::typed(800., 600.));
|
||||
let device = Device::new(MediaType::Screen, TypedSize2D::new(800., 600.));
|
||||
|
||||
test_viewport_rule("@viewport {}", &device, |declarations, css| {
|
||||
println!("{}", css);
|
||||
|
@ -107,7 +107,7 @@ macro_rules! assert_decl_eq {
|
|||
|
||||
#[test]
|
||||
fn simple_viewport_rules() {
|
||||
let device = Device::new(MediaType::Screen, Size2D::typed(800., 600.));
|
||||
let device = Device::new(MediaType::Screen, TypedSize2D::new(800., 600.));
|
||||
|
||||
test_viewport_rule("@viewport { width: auto; height: auto;\
|
||||
zoom: auto; min-zoom: 0; max-zoom: 200%;\
|
||||
|
@ -179,7 +179,7 @@ fn simple_meta_viewport_contents() {
|
|||
|
||||
#[test]
|
||||
fn cascading_within_viewport_rule() {
|
||||
let device = Device::new(MediaType::Screen, Size2D::typed(800., 600.));
|
||||
let device = Device::new(MediaType::Screen, TypedSize2D::new(800., 600.));
|
||||
|
||||
// normal order of appearance
|
||||
test_viewport_rule("@viewport { min-width: 200px; min-width: auto; }",
|
||||
|
@ -246,7 +246,7 @@ fn cascading_within_viewport_rule() {
|
|||
fn multiple_stylesheets_cascading() {
|
||||
::util::prefs::PREFS.set("layout.viewport.enabled",
|
||||
::util::prefs::PrefValue::Boolean(true));
|
||||
let device = Device::new(MediaType::Screen, Size2D::typed(800., 600.));
|
||||
let device = Device::new(MediaType::Screen, TypedSize2D::new(800., 600.));
|
||||
let error_reporter = CSSErrorReporterTest;
|
||||
let stylesheets = vec![
|
||||
stylesheet!("@viewport { min-width: 100px; min-height: 100px; zoom: 1; }", UserAgent, error_reporter.clone()),
|
||||
|
@ -289,11 +289,11 @@ fn constrain_viewport() {
|
|||
}
|
||||
}
|
||||
|
||||
let initial_viewport = Size2D::typed(800., 600.);
|
||||
let initial_viewport = TypedSize2D::new(800., 600.);
|
||||
assert_eq!(ViewportConstraints::maybe_new(initial_viewport, from_css!("")),
|
||||
None);
|
||||
|
||||
let initial_viewport = Size2D::typed(800., 600.);
|
||||
let initial_viewport = TypedSize2D::new(800., 600.);
|
||||
assert_eq!(ViewportConstraints::maybe_new(initial_viewport, from_css!("width: 320px auto")),
|
||||
Some(ViewportConstraints {
|
||||
size: initial_viewport,
|
||||
|
@ -306,10 +306,10 @@ fn constrain_viewport() {
|
|||
orientation: Orientation::Auto
|
||||
}));
|
||||
|
||||
let initial_viewport = Size2D::typed(200., 150.);
|
||||
let initial_viewport = TypedSize2D::new(200., 150.);
|
||||
assert_eq!(ViewportConstraints::maybe_new(initial_viewport, from_css!("width: 320px auto")),
|
||||
Some(ViewportConstraints {
|
||||
size: Size2D::typed(320., 240.),
|
||||
size: TypedSize2D::new(320., 240.),
|
||||
|
||||
initial_zoom: ScaleFactor::new(1.),
|
||||
min_zoom: None,
|
||||
|
@ -319,7 +319,7 @@ fn constrain_viewport() {
|
|||
orientation: Orientation::Auto
|
||||
}));
|
||||
|
||||
let initial_viewport = Size2D::typed(800., 600.);
|
||||
let initial_viewport = TypedSize2D::new(800., 600.);
|
||||
assert_eq!(ViewportConstraints::maybe_new(initial_viewport, from_css!("width: 320px auto")),
|
||||
Some(ViewportConstraints {
|
||||
size: initial_viewport,
|
||||
|
@ -332,7 +332,7 @@ fn constrain_viewport() {
|
|||
orientation: Orientation::Auto
|
||||
}));
|
||||
|
||||
let initial_viewport = Size2D::typed(800., 600.);
|
||||
let initial_viewport = TypedSize2D::new(800., 600.);
|
||||
assert_eq!(ViewportConstraints::maybe_new(initial_viewport, from_css!("width: 800px; height: 600px;\
|
||||
zoom: 1;\
|
||||
user-zoom: zoom;\
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue