diff --git a/servo/components/canvas/Cargo.toml b/servo/components/canvas/Cargo.toml
index d466d425aade..1fec7e751650 100644
--- a/servo/components/canvas/Cargo.toml
+++ b/servo/components/canvas/Cargo.toml
@@ -38,5 +38,5 @@ features = [ "serde-serialization" ]
 log = "0.3"
 num = "0.1.24"
 gleam = "0.1"
-euclid = "0.1"
+euclid = "0.2"
 
diff --git a/servo/components/canvas_traits/Cargo.toml b/servo/components/canvas_traits/Cargo.toml
index d0f5596ddcc9..6bf2f6637326 100644
--- a/servo/components/canvas_traits/Cargo.toml
+++ b/servo/components/canvas_traits/Cargo.toml
@@ -37,6 +37,6 @@ path = "../plugins"
 path = "../util"
 
 [dependencies]
-euclid = "0.1"
+euclid = "0.2"
 serde_macros = "0.5"
 
diff --git a/servo/components/compositing/Cargo.toml b/servo/components/compositing/Cargo.toml
index 417e8a0ca62a..9d0b611a5d4a 100644
--- a/servo/components/compositing/Cargo.toml
+++ b/servo/components/compositing/Cargo.toml
@@ -72,7 +72,7 @@ log = "0.3"
 num = "0.1.24"
 time = "0.1.17"
 gleam = "0.1"
-euclid = "0.1"
+euclid = "0.2"
 
 [target.x86_64-apple-darwin.dependencies]
 core-graphics = "0.1"
diff --git a/servo/components/gfx/Cargo.toml b/servo/components/gfx/Cargo.toml
index 90e4dcace4c7..b8424b593d01 100644
--- a/servo/components/gfx/Cargo.toml
+++ b/servo/components/gfx/Cargo.toml
@@ -10,7 +10,7 @@ path = "lib.rs"
 
 [dependencies]
 bitflags = "0.3"
-euclid = "0.1"
+euclid = "0.2"
 fnv = "1.0"
 harfbuzz = "0.1"
 lazy_static = "0.1"
diff --git a/servo/components/layout/Cargo.toml b/servo/components/layout/Cargo.toml
index 54bf5ba18eb1..e01b44b28277 100644
--- a/servo/components/layout/Cargo.toml
+++ b/servo/components/layout/Cargo.toml
@@ -76,7 +76,7 @@ libc = "0.1"
 smallvec = "0.1"
 string_cache = "0.1"
 string_cache_plugin = "0.1"
-euclid = "0.1"
+euclid = "0.2"
 serde = "0.5"
 serde_macros = "0.5"
 serde_json = "0.5"
diff --git a/servo/components/layout/display_list_builder.rs b/servo/components/layout/display_list_builder.rs
index 8574ce018a0f..9a78c0d89094 100644
--- a/servo/components/layout/display_list_builder.rs
+++ b/servo/components/layout/display_list_builder.rs
@@ -1217,8 +1217,8 @@ impl FragmentDisplayListBuilding for Fragment {
                     transform::ComputedOperation::Matrix(m) => {
                         m.to_gfx_matrix()
                     }
-                    transform::ComputedOperation::Skew(sx, sy) => {
-                        Matrix4::create_skew(sx, sy)
+                    transform::ComputedOperation::Skew(theta_x, theta_y) => {
+                        Matrix4::create_skew(theta_x.radians(), theta_y.radians())
                     }
                 };
 
diff --git a/servo/components/layout_traits/Cargo.toml b/servo/components/layout_traits/Cargo.toml
index 9c4908e984f7..7bce3b48ab4b 100644
--- a/servo/components/layout_traits/Cargo.toml
+++ b/servo/components/layout_traits/Cargo.toml
@@ -33,7 +33,7 @@ version = "0.2"
 features = [ "serde_serialization" ]
 
 [dependencies]
-euclid = "0.1"
+euclid = "0.2"
 serde = "0.5"
 serde_macros = "0.5"
 
diff --git a/servo/components/msg/Cargo.toml b/servo/components/msg/Cargo.toml
index 32819c5faf94..6a20f8e7ffb7 100644
--- a/servo/components/msg/Cargo.toml
+++ b/servo/components/msg/Cargo.toml
@@ -47,7 +47,7 @@ path = "../plugins"
 [dependencies]
 bitflags = "0.3"
 rustc-serialize = "0.3.4"
-euclid = "0.1"
+euclid = "0.2"
 serde = "0.5"
 serde_macros = "0.5"
 
diff --git a/servo/components/net/Cargo.toml b/servo/components/net/Cargo.toml
index 19d046dc1432..1b9006ec00b2 100644
--- a/servo/components/net/Cargo.toml
+++ b/servo/components/net/Cargo.toml
@@ -41,4 +41,4 @@ regex = "0.1.14"
 regex_macros = "0.1.8"
 flate2 = "0.2.0"
 uuid = "0.1.16"
-euclid = "0.1"
+euclid = "0.2"
diff --git a/servo/components/net_traits/Cargo.toml b/servo/components/net_traits/Cargo.toml
index e2fb0c6b4460..d6305ed7dc28 100644
--- a/servo/components/net_traits/Cargo.toml
+++ b/servo/components/net_traits/Cargo.toml
@@ -36,7 +36,7 @@ path = "../plugins"
 
 [dependencies]
 log = "0.3"
-euclid = "0.1"
+euclid = "0.2"
 regex = "0.1.33"
 regex_macros = "0.1.19"
 serde = "0.5"
diff --git a/servo/components/script/Cargo.toml b/servo/components/script/Cargo.toml
index c6b96713b012..1b8e91b91335 100644
--- a/servo/components/script/Cargo.toml
+++ b/servo/components/script/Cargo.toml
@@ -86,7 +86,7 @@ smallvec = "0.1"
 html5ever = { version = "0.2.1", features = ["unstable"] }
 string_cache = { version = "0.1.9", features = ["unstable"] }
 string_cache_plugin = "0.1"
-euclid = "0.1"
+euclid = "0.2"
 tendril = "0.1.1"
 rand = "0.3"
 serde = "0.5"
diff --git a/servo/components/script_traits/Cargo.toml b/servo/components/script_traits/Cargo.toml
index bdb460e83dc8..89e779ecce77 100644
--- a/servo/components/script_traits/Cargo.toml
+++ b/servo/components/script_traits/Cargo.toml
@@ -31,7 +31,7 @@ features = [ "serde_serialization" ]
 
 [dependencies]
 libc = "0.1"
-euclid = "0.1"
+euclid = "0.2"
 serde = "0.5"
 serde_macros = "0.5"
 
diff --git a/servo/components/servo/Cargo.lock b/servo/components/servo/Cargo.lock
index 1ad6bb526d6e..64b32314511a 100644
--- a/servo/components/servo/Cargo.lock
+++ b/servo/components/servo/Cargo.lock
@@ -10,7 +10,7 @@ dependencies = [
  "devtools 0.0.1",
  "devtools_traits 0.0.1",
  "env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
  "gfx_tests 0.0.1",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -79,15 +79,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "azure"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#53e7b7d07bd43199b136d869b1605016ed882cbc"
+source = "git+https://github.com/servo/rust-azure#ee33b764b4fd6121043db2b8217e6f6dc89fe224"
 dependencies = [
  "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
  "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
+ "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heapsize_plugin 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -136,7 +138,7 @@ dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "canvas_traits 0.0.1",
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx_traits 0.0.1",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
@@ -153,7 +155,7 @@ version = "0.0.1"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx_traits 0.0.1",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
@@ -227,7 +229,7 @@ dependencies = [
  "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
  "devtools_traits 0.0.1",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
  "gfx_traits 0.0.1",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -480,7 +482,7 @@ dependencies = [
 
 [[package]]
 name = "euclid"
-version = "0.1.6"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -585,7 +587,7 @@ dependencies = [
  "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fontconfig 0.1.0 (git+https://github.com/servo/rust-fontconfig)",
  "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
@@ -707,7 +709,7 @@ dependencies = [
  "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "compositing 0.0.1",
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "glutin 0.3.5 (git+https://github.com/servo/glutin?branch=servo)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
@@ -775,6 +777,11 @@ dependencies = [
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "heapsize_plugin"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "hpack"
 version = "0.2.0"
@@ -839,11 +846,11 @@ dependencies = [
 [[package]]
 name = "io-surface"
 version = "0.1.0"
-source = "git+https://github.com/servo/io-surface-rs#55ed8f9491e6d1f67b60ed2683088a4c5da058f2"
+source = "git+https://github.com/servo/io-surface-rs#c558d64ea5cf3acd5fbbaf004513853cccd77761"
 dependencies = [
  "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -896,13 +903,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "layers"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-layers#a8400005fd3ee37ced92865184974c9a93201bc0"
+source = "git+https://github.com/servo/rust-layers#ed0ed729b138e4051b1e7e4e7c4b7e4dd1276ab0"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "glx 0.0.1 (git+https://github.com/servo/rust-glx)",
  "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
@@ -924,7 +931,7 @@ dependencies = [
  "clock_ticks 0.0.6 (git+https://github.com/tomaka/clock_ticks)",
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
  "gfx_traits 0.0.1",
@@ -956,7 +963,7 @@ dependencies = [
 name = "layout_traits"
 version = "0.0.1"
 dependencies = [
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "msg 0.0.1",
@@ -1060,7 +1067,7 @@ dependencies = [
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "canvas_traits 0.0.1",
  "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
@@ -1082,7 +1089,7 @@ version = "0.0.1"
 dependencies = [
  "cookie 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "devtools_traits 0.0.1",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
@@ -1118,7 +1125,7 @@ dependencies = [
 name = "net_traits"
 version = "0.0.1"
 dependencies = [
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1182,11 +1189,11 @@ dependencies = [
 [[package]]
 name = "offscreen_gl_context"
 version = "0.1.0"
-source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#41fb6bf5a8ff16024e62ec71892bfe7697de3b7d"
+source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#6d77c936805d841e54ff8cff45af23cc40f5d8c2"
 dependencies = [
  "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gl_generator 0.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "khronos_api 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1410,7 +1417,7 @@ dependencies = [
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "devtools_traits 0.0.1",
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "html5ever 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1455,7 +1462,7 @@ name = "script_traits"
 version = "0.0.1"
 dependencies = [
  "devtools_traits 0.0.1",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
@@ -1543,11 +1550,11 @@ source = "git+https://github.com/huonw/simd#d9ad79d86eab50a8f36d45fe17aa9e3a5333
 [[package]]
 name = "skia"
 version = "0.0.20130412"
-source = "git+https://github.com/servo/skia#3be758ea29cbd315febfda5a536ef9984a0ae862"
+source = "git+https://github.com/servo/skia#1aa954c2031a55f0869a37c0115e26b9a1d3c58b"
 dependencies = [
  "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "expat-sys 2.1.0 (git+https://github.com/servo/libexpat)",
  "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1617,7 +1624,7 @@ dependencies = [
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1641,7 +1648,7 @@ name = "style_tests"
 version = "0.0.1"
 dependencies = [
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
  "string_cache 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1656,7 +1663,7 @@ name = "style_traits"
 version = "0.0.1"
 dependencies = [
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1778,7 +1785,7 @@ dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "getopts 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "html5ever 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1805,7 +1812,7 @@ dependencies = [
 name = "util_tests"
 version = "0.0.1"
 dependencies = [
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "plugins 0.0.1",
  "util 0.0.1",
diff --git a/servo/components/servo/Cargo.toml b/servo/components/servo/Cargo.toml
index 95b70226b3d2..6ced02d7d45b 100644
--- a/servo/components/servo/Cargo.toml
+++ b/servo/components/servo/Cargo.toml
@@ -120,7 +120,7 @@ version = "0.2"
 features = [ "serde_serialization" ]
 
 [dependencies.euclid]
-version = "0.1"
+version = "0.2"
 
 [dependencies.layers]
 git = "https://github.com/servo/rust-layers"
diff --git a/servo/components/style/Cargo.toml b/servo/components/style/Cargo.toml
index 4bbc4762da90..c67bf7136162 100644
--- a/servo/components/style/Cargo.toml
+++ b/servo/components/style/Cargo.toml
@@ -42,6 +42,6 @@ lazy_static = "0.1.10"
 smallvec = "0.1"
 string_cache = "0.1"
 string_cache_plugin = "0.1"
-euclid = "0.1"
+euclid = "0.2"
 serde = "0.5"
 serde_macros = "0.5"
diff --git a/servo/components/style/animation.rs b/servo/components/style/animation.rs
index 34043e47a989..247ceb6b2a59 100644
--- a/servo/components/style/animation.rs
+++ b/servo/components/style/animation.rs
@@ -415,6 +415,13 @@ impl Interpolate for i32 {
     }
 }
 
+impl Interpolate for Angle {
+    #[inline]
+    fn interpolate(&self, other: &Angle, time: f64) -> Option<Angle> {
+        self.radians().interpolate(&other.radians(), time).map(Angle)
+    }
+}
+
 impl Interpolate for Visibility {
     #[inline]
     fn interpolate(&self, other: &Visibility, time: f64)
@@ -804,7 +811,7 @@ fn build_identity_transform_list(list: &Vec<TransformOperation>) -> Vec<Transfor
                 result.push(TransformOperation::Matrix(identity));
             }
             TransformOperation::Skew(..) => {
-                result.push(TransformOperation::Skew(0.0, 0.0));
+                result.push(TransformOperation::Skew(Angle(0.0), Angle(0.0)));
             }
             TransformOperation::Translate(..) => {
                 result.push(TransformOperation::Translate(LengthOrPercentage::zero(),
diff --git a/servo/components/style/properties.mako.rs b/servo/components/style/properties.mako.rs
index 5b4d765fa080..9bd8ea108044 100644
--- a/servo/components/style/properties.mako.rs
+++ b/servo/components/style/properties.mako.rs
@@ -3610,7 +3610,7 @@ pub mod longhands {
             #[derive(Clone, Debug, PartialEq, HeapSizeOf)]
             pub enum ComputedOperation {
                 Matrix(ComputedMatrix),
-                Skew(CSSFloat, CSSFloat),
+                Skew(computed::Angle, computed::Angle),
                 Translate(computed::LengthOrPercentage,
                           computed::LengthOrPercentage,
                           computed::Length),
@@ -3645,6 +3645,15 @@ pub mod longhands {
             Ok((first, second))
         }
 
+        fn parse_two_angles(input: &mut Parser) -> Result<(specified::Angle, specified::Angle),()> {
+            let first = try!(specified::Angle::parse(input));
+            let second = input.try(|input| {
+                try!(input.expect_comma());
+                specified::Angle::parse(input)
+            }).unwrap_or(specified::Angle(0.0));
+            Ok((first, second))
+        }
+
         #[derive(Copy, Clone, Debug, PartialEq)]
         enum TranslateKind {
             Translate,
@@ -3657,7 +3666,7 @@ pub mod longhands {
         #[derive(Clone, Debug, PartialEq)]
         enum SpecifiedOperation {
             Matrix(SpecifiedMatrix),
-            Skew(CSSFloat, CSSFloat),
+            Skew(specified::Angle, specified::Angle),
             Translate(TranslateKind,
                       specified::LengthOrPercentage,
                       specified::LengthOrPercentage,
@@ -3946,22 +3955,22 @@ pub mod longhands {
                     },
                     "skew" => {
                         try!(input.parse_nested_block(|input| {
-                            let (sx, sy) = try!(parse_two_floats(input));
-                            result.push(SpecifiedOperation::Skew(sx, sy));
+                            let (theta_x, theta_y) = try!(parse_two_angles(input));
+                            result.push(SpecifiedOperation::Skew(theta_x, theta_y));
                             Ok(())
                         }))
                     },
                     "skewx" => {
                         try!(input.parse_nested_block(|input| {
-                            let sx = try!(input.expect_number());
-                            result.push(SpecifiedOperation::Skew(sx, 1.0));
+                            let theta_x = try!(specified::Angle::parse(input));
+                            result.push(SpecifiedOperation::Skew(theta_x, specified::Angle(0.0)));
                             Ok(())
                         }))
                     },
                     "skewy" => {
                         try!(input.parse_nested_block(|input| {
-                            let sy = try!(input.expect_number());
-                            result.push(SpecifiedOperation::Skew(1.0, sy));
+                            let theta_y = try!(specified::Angle::parse(input));
+                            result.push(SpecifiedOperation::Skew(specified::Angle(0.0), theta_y));
                             Ok(())
                         }))
                     },
@@ -4009,8 +4018,8 @@ pub mod longhands {
                         SpecifiedOperation::Rotate(ax, ay, az, theta) => {
                             result.push(computed_value::ComputedOperation::Rotate(ax, ay, az, theta));
                         }
-                        SpecifiedOperation::Skew(sx, sy) => {
-                            result.push(computed_value::ComputedOperation::Skew(sx, sy));
+                        SpecifiedOperation::Skew(theta_x, theta_y) => {
+                            result.push(computed_value::ComputedOperation::Skew(theta_x, theta_y));
                         }
                         SpecifiedOperation::Perspective(d) => {
                             result.push(computed_value::ComputedOperation::Perspective(d.to_computed_value(context)));
diff --git a/servo/components/style_traits/Cargo.toml b/servo/components/style_traits/Cargo.toml
index 316ce73f462c..4c12db7fbbc3 100644
--- a/servo/components/style_traits/Cargo.toml
+++ b/servo/components/style_traits/Cargo.toml
@@ -26,7 +26,7 @@ version = "0.2"
 features = [ "serde_serialization" ]
 
 [dependencies]
-euclid = "0.1"
+euclid = "0.2"
 log = "0.3"
 lazy_static = "0.1.10"
 num = "0.1.24"
diff --git a/servo/components/util/Cargo.toml b/servo/components/util/Cargo.toml
index 5a537c251c90..f9a694578dfa 100644
--- a/servo/components/util/Cargo.toml
+++ b/servo/components/util/Cargo.toml
@@ -51,7 +51,7 @@ rustc-serialize = "0.3"
 smallvec = "0.1"
 num_cpus = "0.2.2"
 num = "0.1.24"
-euclid = "0.1"
+euclid = "0.2"
 serde = "0.5"
 serde_macros = "0.5"
 string_cache = "0.1"
diff --git a/servo/ports/cef/Cargo.lock b/servo/ports/cef/Cargo.lock
index 3f1932ed98db..c10a232265b7 100644
--- a/servo/ports/cef/Cargo.lock
+++ b/servo/ports/cef/Cargo.lock
@@ -10,7 +10,7 @@ dependencies = [
  "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
  "devtools 0.0.1",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "glutin_app 0.0.1",
@@ -71,15 +71,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "azure"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#53e7b7d07bd43199b136d869b1605016ed882cbc"
+source = "git+https://github.com/servo/rust-azure#ee33b764b4fd6121043db2b8217e6f6dc89fe224"
 dependencies = [
  "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
  "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
+ "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heapsize_plugin 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -128,7 +130,7 @@ dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "canvas_traits 0.0.1",
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx_traits 0.0.1",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
@@ -145,7 +147,7 @@ version = "0.0.1"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx_traits 0.0.1",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
@@ -219,7 +221,7 @@ dependencies = [
  "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
  "devtools_traits 0.0.1",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
  "gfx_traits 0.0.1",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -438,7 +440,7 @@ dependencies = [
 
 [[package]]
 name = "euclid"
-version = "0.1.6"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -543,7 +545,7 @@ dependencies = [
  "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fontconfig 0.1.0 (git+https://github.com/servo/rust-fontconfig)",
  "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
@@ -658,7 +660,7 @@ dependencies = [
  "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "compositing 0.0.1",
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "glutin 0.3.5 (git+https://github.com/servo/glutin?branch=servo)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
@@ -726,6 +728,11 @@ dependencies = [
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "heapsize_plugin"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "hpack"
 version = "0.2.0"
@@ -790,11 +797,11 @@ dependencies = [
 [[package]]
 name = "io-surface"
 version = "0.1.0"
-source = "git+https://github.com/servo/io-surface-rs#55ed8f9491e6d1f67b60ed2683088a4c5da058f2"
+source = "git+https://github.com/servo/io-surface-rs#c558d64ea5cf3acd5fbbaf004513853cccd77761"
 dependencies = [
  "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -847,13 +854,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "layers"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-layers#a8400005fd3ee37ced92865184974c9a93201bc0"
+source = "git+https://github.com/servo/rust-layers#ed0ed729b138e4051b1e7e4e7c4b7e4dd1276ab0"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "glx 0.0.1 (git+https://github.com/servo/rust-glx)",
  "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
@@ -875,7 +882,7 @@ dependencies = [
  "clock_ticks 0.0.6 (git+https://github.com/tomaka/clock_ticks)",
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
  "gfx_traits 0.0.1",
@@ -907,7 +914,7 @@ dependencies = [
 name = "layout_traits"
 version = "0.0.1"
 dependencies = [
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "msg 0.0.1",
@@ -1011,7 +1018,7 @@ dependencies = [
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "canvas_traits 0.0.1",
  "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
@@ -1033,7 +1040,7 @@ version = "0.0.1"
 dependencies = [
  "cookie 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "devtools_traits 0.0.1",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
@@ -1054,7 +1061,7 @@ dependencies = [
 name = "net_traits"
 version = "0.0.1"
 dependencies = [
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1118,12 +1125,12 @@ dependencies = [
 [[package]]
 name = "offscreen_gl_context"
 version = "0.1.0"
-source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#41fb6bf5a8ff16024e62ec71892bfe7697de3b7d"
+source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#6d77c936805d841e54ff8cff45af23cc40f5d8c2"
 dependencies = [
  "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "gl_generator 0.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gl_generator 0.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "khronos_api 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
@@ -1344,7 +1351,7 @@ dependencies = [
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "devtools_traits 0.0.1",
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "html5ever 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1381,7 +1388,7 @@ name = "script_traits"
 version = "0.0.1"
 dependencies = [
  "devtools_traits 0.0.1",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
@@ -1454,7 +1461,7 @@ dependencies = [
  "devtools 0.0.1",
  "devtools_traits 0.0.1",
  "env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "glutin_app 0.0.1",
@@ -1502,11 +1509,11 @@ source = "git+https://github.com/huonw/simd#be4242121e081206d8769cc60a7d2fa8e23c
 [[package]]
 name = "skia"
 version = "0.0.20130412"
-source = "git+https://github.com/servo/skia#3be758ea29cbd315febfda5a536ef9984a0ae862"
+source = "git+https://github.com/servo/skia#1aa954c2031a55f0869a37c0115e26b9a1d3c58b"
 dependencies = [
  "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "expat-sys 2.1.0 (git+https://github.com/servo/libexpat)",
  "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1576,7 +1583,7 @@ dependencies = [
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1600,7 +1607,7 @@ name = "style_traits"
 version = "0.0.1"
 dependencies = [
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1722,7 +1729,7 @@ dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "getopts 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "html5ever 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/servo/ports/cef/Cargo.toml b/servo/ports/cef/Cargo.toml
index 7f9515bd3b93..a9e3948a3e71 100644
--- a/servo/ports/cef/Cargo.toml
+++ b/servo/ports/cef/Cargo.toml
@@ -12,7 +12,7 @@ crate-type = ["dylib"]
 log = "*"
 url = "*"
 libc = "*"
-euclid = "0.1"
+euclid = "0.2"
 gleam = "0.1"
 
 [dependencies.servo]
diff --git a/servo/ports/glutin/Cargo.toml b/servo/ports/glutin/Cargo.toml
index 774750988089..42a789d6becf 100644
--- a/servo/ports/glutin/Cargo.toml
+++ b/servo/ports/glutin/Cargo.toml
@@ -17,7 +17,7 @@ bitflags = "0.3"
 libc = "0.1"
 url = "0.2"
 gleam = "0.1"
-euclid = "0.1"
+euclid = "0.2"
 
 [dependencies.compositing]
 path = "../../components/compositing"
diff --git a/servo/ports/gonk/Cargo.lock b/servo/ports/gonk/Cargo.lock
index bc3956480fcb..2974aa692097 100644
--- a/servo/ports/gonk/Cargo.lock
+++ b/servo/ports/gonk/Cargo.lock
@@ -7,7 +7,7 @@ dependencies = [
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
  "env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "errno 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
@@ -57,15 +57,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "azure"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-azure#53e7b7d07bd43199b136d869b1605016ed882cbc"
+source = "git+https://github.com/servo/rust-azure#ee33b764b4fd6121043db2b8217e6f6dc89fe224"
 dependencies = [
  "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
  "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
+ "heapsize 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heapsize_plugin 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -109,7 +111,7 @@ dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "canvas_traits 0.0.1",
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx_traits 0.0.1",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
@@ -126,7 +128,7 @@ version = "0.0.1"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx_traits 0.0.1",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
@@ -189,7 +191,7 @@ dependencies = [
  "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
  "devtools_traits 0.0.1",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
  "gfx_traits 0.0.1",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -393,7 +395,7 @@ dependencies = [
 
 [[package]]
 name = "euclid"
-version = "0.1.6"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -490,7 +492,7 @@ dependencies = [
  "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-text 0.1.0 (git+https://github.com/servo/core-text-rs)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fontconfig 0.1.0 (git+https://github.com/servo/rust-fontconfig)",
  "freetype 0.1.0 (git+https://github.com/servo/rust-freetype)",
@@ -610,6 +612,11 @@ dependencies = [
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "heapsize_plugin"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "hpack"
 version = "0.2.0"
@@ -674,11 +681,11 @@ dependencies = [
 [[package]]
 name = "io-surface"
 version = "0.1.0"
-source = "git+https://github.com/servo/io-surface-rs#55ed8f9491e6d1f67b60ed2683088a4c5da058f2"
+source = "git+https://github.com/servo/io-surface-rs#c558d64ea5cf3acd5fbbaf004513853cccd77761"
 dependencies = [
  "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -731,13 +738,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "layers"
 version = "0.1.0"
-source = "git+https://github.com/servo/rust-layers#a8400005fd3ee37ced92865184974c9a93201bc0"
+source = "git+https://github.com/servo/rust-layers#ed0ed729b138e4051b1e7e4e7c4b7e4dd1276ab0"
 dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "glx 0.0.1 (git+https://github.com/servo/rust-glx)",
  "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
@@ -759,7 +766,7 @@ dependencies = [
  "clock_ticks 0.0.6 (git+https://github.com/tomaka/clock_ticks)",
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
  "gfx_traits 0.0.1",
@@ -791,7 +798,7 @@ dependencies = [
 name = "layout_traits"
 version = "0.0.1"
 dependencies = [
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "msg 0.0.1",
@@ -886,7 +893,7 @@ dependencies = [
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "canvas_traits 0.0.1",
  "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
@@ -908,7 +915,7 @@ version = "0.0.1"
 dependencies = [
  "cookie 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "devtools_traits 0.0.1",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
@@ -929,7 +936,7 @@ dependencies = [
 name = "net_traits"
 version = "0.0.1"
 dependencies = [
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -993,11 +1000,11 @@ dependencies = [
 [[package]]
 name = "offscreen_gl_context"
 version = "0.1.0"
-source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#41fb6bf5a8ff16024e62ec71892bfe7697de3b7d"
+source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#6d77c936805d841e54ff8cff45af23cc40f5d8c2"
 dependencies = [
  "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gl_generator 0.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "khronos_api 0.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1210,7 +1217,7 @@ dependencies = [
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "devtools_traits 0.0.1",
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "html5ever 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1247,7 +1254,7 @@ name = "script_traits"
 version = "0.0.1"
 dependencies = [
  "devtools_traits 0.0.1",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.1.0 (git+https://github.com/pcwalton/ipc-channel)",
  "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
@@ -1320,7 +1327,7 @@ dependencies = [
  "devtools 0.0.1",
  "devtools_traits 0.0.1",
  "env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx 0.0.1",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
@@ -1348,11 +1355,11 @@ source = "git+https://github.com/huonw/simd#be4242121e081206d8769cc60a7d2fa8e23c
 [[package]]
 name = "skia"
 version = "0.0.20130412"
-source = "git+https://github.com/servo/skia#3be758ea29cbd315febfda5a536ef9984a0ae862"
+source = "git+https://github.com/servo/skia#1aa954c2031a55f0869a37c0115e26b9a1d3c58b"
 dependencies = [
  "cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "expat-sys 2.1.0 (git+https://github.com/servo/libexpat)",
  "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2)",
  "gleam 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1422,7 +1429,7 @@ dependencies = [
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1446,7 +1453,7 @@ name = "style_traits"
 version = "0.0.1"
 dependencies = [
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "num 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1557,7 +1564,7 @@ dependencies = [
  "azure 0.1.0 (git+https://github.com/servo/rust-azure)",
  "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "cssparser 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "getopts 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "html5ever 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/servo/ports/gonk/Cargo.toml b/servo/ports/gonk/Cargo.toml
index b81f8bbc1f2e..86564015f703 100644
--- a/servo/ports/gonk/Cargo.toml
+++ b/servo/ports/gonk/Cargo.toml
@@ -51,5 +51,5 @@ url = "0.2.16"
 time = "0.1.17"
 errno = "0.1"
 libc = "0.1"
-euclid = "0.1"
+euclid = "0.2"
 gleam = "0.1"
diff --git a/servo/tests/unit/style/Cargo.toml b/servo/tests/unit/style/Cargo.toml
index 2b1a9e0b3be0..e322e0bffe20 100644
--- a/servo/tests/unit/style/Cargo.toml
+++ b/servo/tests/unit/style/Cargo.toml
@@ -25,4 +25,4 @@ url = "0.2"
 cssparser = "0.3.1"
 string_cache = "0.1"
 string_cache_plugin = "0.1"
-euclid = "0.1"
+euclid = "0.2"
diff --git a/servo/tests/unit/util/Cargo.toml b/servo/tests/unit/util/Cargo.toml
index ddc3a6ef00df..73351c4f6c7f 100644
--- a/servo/tests/unit/util/Cargo.toml
+++ b/servo/tests/unit/util/Cargo.toml
@@ -17,5 +17,5 @@ path = "../../../components/plugins"
 
 [dependencies]
 libc = "0.1"
-euclid = "0.1"
+euclid = "0.2"