diff --git a/Cargo.lock b/Cargo.lock
index d6198007229..20ca2b76d5e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -283,7 +283,7 @@ dependencies = [
  "num-traits 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "offscreen_gl_context 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_config 0.0.1",
- "webrender_traits 0.23.1 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.24.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -297,7 +297,7 @@ dependencies = [
  "ipc-channel 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.23.1 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.24.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -418,8 +418,8 @@ dependencies = [
  "servo_url 0.0.1",
  "style_traits 0.0.1",
  "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender 0.22.1 (git+https://github.com/servo/webrender)",
- "webrender_traits 0.23.1 (git+https://github.com/servo/webrender)",
+ "webrender 0.23.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.24.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -452,7 +452,7 @@ dependencies = [
  "servo_remutex 0.0.1",
  "servo_url 0.0.1",
  "style_traits 0.0.1",
- "webrender_traits 0.23.1 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.24.0 (git+https://github.com/servo/webrender)",
  "webvr_traits 0.0.1",
 ]
 
@@ -707,7 +707,7 @@ dependencies = [
  "servo_geometry 0.0.1",
  "servo_url 0.0.1",
  "style_traits 0.0.1",
- "webrender_traits 0.23.1 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.24.0 (git+https://github.com/servo/webrender)",
  "x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -994,7 +994,7 @@ dependencies = [
  "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "truetype 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.23.1 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.24.0 (git+https://github.com/servo/webrender)",
  "xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1073,7 +1073,7 @@ dependencies = [
  "servo_url 0.0.1",
  "style_traits 0.0.1",
  "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.23.1 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.24.0 (git+https://github.com/servo/webrender)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1375,7 +1375,7 @@ dependencies = [
  "style_traits 0.0.1",
  "unicode-bidi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.23.1 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.24.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -1415,7 +1415,7 @@ dependencies = [
  "servo_geometry 0.0.1",
  "servo_url 0.0.1",
  "style 0.0.1",
- "webrender_traits 0.23.1 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.24.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -1429,7 +1429,7 @@ dependencies = [
  "profile_traits 0.0.1",
  "script_traits 0.0.1",
  "servo_url 0.0.1",
- "webrender_traits 0.23.1 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.24.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -1514,8 +1514,8 @@ dependencies = [
  "style 0.0.1",
  "style_traits 0.0.1",
  "webdriver_server 0.0.1",
- "webrender 0.22.1 (git+https://github.com/servo/webrender)",
- "webrender_traits 0.23.1 (git+https://github.com/servo/webrender)",
+ "webrender 0.23.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.24.0 (git+https://github.com/servo/webrender)",
  "webvr 0.0.1",
  "webvr_traits 0.0.1",
 ]
@@ -1663,7 +1663,7 @@ dependencies = [
  "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 0.9.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.23.1 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.24.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -1700,7 +1700,7 @@ dependencies = [
  "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.23.1 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.24.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -1759,7 +1759,7 @@ dependencies = [
  "servo_url 0.0.1",
  "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.23.1 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.24.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -2297,7 +2297,7 @@ dependencies = [
  "tinyfiledialogs 2.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.23.1 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.24.0 (git+https://github.com/servo/webrender)",
  "webvr 0.0.1",
  "webvr_traits 0.0.1",
  "xml5ever 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3174,8 +3174,8 @@ dependencies = [
 
 [[package]]
 name = "webrender"
-version = "0.22.1"
-source = "git+https://github.com/servo/webrender#ec377923dd3ccc67b26ae5dfeb04c87af42ede06"
+version = "0.23.0"
+source = "git+https://github.com/servo/webrender#bfef6dbb9fe69a8c408568c85b392186d3853477"
 dependencies = [
  "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 1.0.0-alpha2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3197,13 +3197,13 @@ dependencies = [
  "thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "threadpool 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_traits 0.23.1 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.24.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
 name = "webrender_traits"
-version = "0.23.1"
-source = "git+https://github.com/servo/webrender#ec377923dd3ccc67b26ae5dfeb04c87af42ede06"
+version = "0.24.0"
+source = "git+https://github.com/servo/webrender#bfef6dbb9fe69a8c408568c85b392186d3853477"
 dependencies = [
  "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3227,7 +3227,7 @@ dependencies = [
  "msg 0.0.1",
  "script_traits 0.0.1",
  "servo_config 0.0.1",
- "webrender_traits 0.23.1 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.24.0 (git+https://github.com/servo/webrender)",
  "webvr_traits 0.0.1",
 ]
 
@@ -3567,8 +3567,8 @@ dependencies = [
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff"
 "checksum webdriver 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cdc28802daddee94267a657ffeac2593a33881fb7a3a44fedd320b1319efcaf6"
-"checksum webrender 0.22.1 (git+https://github.com/servo/webrender)" = "<none>"
-"checksum webrender_traits 0.23.1 (git+https://github.com/servo/webrender)" = "<none>"
+"checksum webrender 0.23.0 (git+https://github.com/servo/webrender)" = "<none>"
+"checksum webrender_traits 0.24.0 (git+https://github.com/servo/webrender)" = "<none>"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 "checksum ws 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "04614a58714f3fd4a8b1da4bcae9f031c532d35988c3d39627619248113f8be8"
diff --git a/components/layout/webrender_helpers.rs b/components/layout/webrender_helpers.rs
index 1a8b33e5e4a..63814f6f5ed 100644
--- a/components/layout/webrender_helpers.rs
+++ b/components/layout/webrender_helpers.rs
@@ -405,7 +405,7 @@ impl WebRenderDisplayItemConverter for DisplayItem {
 
                 builder.push_scroll_layer(clip,
                                           item.scroll_root.size.to_sizef(),
-                                          item.scroll_root.id.convert_to_webrender());
+                                          Some(item.scroll_root.id.convert_to_webrender()));
             }
             DisplayItem::PopScrollRoot(_) => builder.pop_scroll_layer(),
         }