aboutsummaryrefslogtreecommitdiffstats
path: root/components/script_traits
diff options
context:
space:
mode:
authorMartin Robinson <mrobinson@igalia.com>2016-08-11 00:29:19 +0200
committerAnthony Ramine <n.oxyde@gmail.com>2016-08-12 03:12:06 +0200
commit6259df5e2da6574f3d5951a7df2cb511d263697a (patch)
treef68cc95e507fc7e208a3c04de637c0914bcd9d60 /components/script_traits
parentb7facf41cbc7ba727666e95fd0c390d432d862fa (diff)
downloadservo-6259df5e2da6574f3d5951a7df2cb511d263697a.tar.gz
servo-6259df5e2da6574f3d5951a7df2cb511d263697a.zip
Update to euclid 0.8
Diffstat (limited to 'components/script_traits')
-rw-r--r--components/script_traits/Cargo.toml4
-rw-r--r--components/script_traits/lib.rs10
2 files changed, 7 insertions, 7 deletions
diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml
index 47fc10b95c7..86c0361481d 100644
--- a/components/script_traits/Cargo.toml
+++ b/components/script_traits/Cargo.toml
@@ -14,7 +14,7 @@ app_units = "0.2.5"
canvas_traits = {path = "../canvas_traits"}
cookie = { version = "0.2.5", features = ["serialize-rustc", "serialize-serde"]}
devtools_traits = {path = "../devtools_traits"}
-euclid = "0.7.1"
+euclid = "0.8.2"
gfx_traits = {path = "../gfx_traits"}
heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
@@ -23,7 +23,7 @@ layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
libc = "0.2"
msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
-offscreen_gl_context = "0.1.2"
+offscreen_gl_context = "0.2.0"
plugins = {path = "../plugins"}
profile_traits = {path = "../profile_traits"}
rustc-serialize = "0.3.4"
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs
index 8269ca318ed..0bc9225d42c 100644
--- a/components/script_traits/lib.rs
+++ b/components/script_traits/lib.rs
@@ -365,9 +365,9 @@ pub enum Milliseconds {}
pub enum Nanoseconds {}
/// Amount of milliseconds.
-pub type MsDuration = Length<Milliseconds, u64>;
+pub type MsDuration = Length<u64, Milliseconds>;
/// Amount of nanoseconds.
-pub type NsDuration = Length<Nanoseconds, u64>;
+pub type NsDuration = Length<u64, Nanoseconds>;
/// Returns the duration since an unspecified epoch measured in ms.
pub fn precise_time_ms() -> MsDuration {
@@ -568,13 +568,13 @@ pub struct StackingContextScrollState {
pub struct WindowSizeData {
/// The size of the initial layout viewport, before parsing an
/// http://www.w3.org/TR/css-device-adapt/#initial-viewport
- pub initial_viewport: TypedSize2D<ViewportPx, f32>,
+ pub initial_viewport: TypedSize2D<f32, ViewportPx>,
/// The "viewing area" in page px. See `PagePx` documentation for details.
- pub visible_viewport: TypedSize2D<PagePx, f32>,
+ pub visible_viewport: TypedSize2D<f32, PagePx>,
/// The resolution of the window in dppx, not including any "pinch zoom" factor.
- pub device_pixel_ratio: ScaleFactor<ViewportPx, DevicePixel, f32>,
+ pub device_pixel_ratio: ScaleFactor<f32, ViewportPx, DevicePixel>,
}
/// Messages to the constellation originating from the WebDriver server.