diff --git a/Cargo.lock b/Cargo.lock
index 4248c5ef2e8..2235a285570 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -334,8 +334,8 @@ dependencies = [
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
  "offscreen_gl_context 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender 0.48.1 (git+https://github.com/servo/webrender)",
- "webrender_api 0.48.1 (git+https://github.com/servo/webrender)",
+ "webrender 0.49.0 (git+https://github.com/servo/webrender)",
+ "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -351,7 +351,7 @@ dependencies = [
  "offscreen_gl_context 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_config 0.0.1",
- "webrender_api 0.48.1 (git+https://github.com/servo/webrender)",
+ "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -502,8 +502,8 @@ dependencies = [
  "servo_url 0.0.1",
  "style_traits 0.0.1",
  "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender 0.48.1 (git+https://github.com/servo/webrender)",
- "webrender_api 0.48.1 (git+https://github.com/servo/webrender)",
+ "webrender 0.49.0 (git+https://github.com/servo/webrender)",
+ "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -539,7 +539,7 @@ dependencies = [
  "servo_remutex 0.0.1",
  "servo_url 0.0.1",
  "style_traits 0.0.1",
- "webrender_api 0.48.1 (git+https://github.com/servo/webrender)",
+ "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
  "webvr_traits 0.0.1",
 ]
 
@@ -775,7 +775,7 @@ dependencies = [
  "servo_geometry 0.0.1",
  "servo_url 0.0.1",
  "style_traits 0.0.1",
- "webrender_api 0.48.1 (git+https://github.com/servo/webrender)",
+ "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
  "x11 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1089,7 +1089,7 @@ dependencies = [
  "truetype 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.48.1 (git+https://github.com/servo/webrender)",
+ "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
  "xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "xml5ever 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1170,7 +1170,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_api 0.48.1 (git+https://github.com/servo/webrender)",
+ "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "x11 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1486,7 +1486,7 @@ dependencies = [
  "style_traits 0.0.1",
  "unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.48.1 (git+https://github.com/servo/webrender)",
+ "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -1533,7 +1533,7 @@ dependencies = [
  "servo_url 0.0.1",
  "style 0.0.1",
  "style_traits 0.0.1",
- "webrender_api 0.48.1 (git+https://github.com/servo/webrender)",
+ "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -1548,7 +1548,7 @@ dependencies = [
  "profile_traits 0.0.1",
  "script_traits 0.0.1",
  "servo_url 0.0.1",
- "webrender_api 0.48.1 (git+https://github.com/servo/webrender)",
+ "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -1632,8 +1632,8 @@ dependencies = [
  "style 0.0.1",
  "style_traits 0.0.1",
  "webdriver_server 0.0.1",
- "webrender 0.48.1 (git+https://github.com/servo/webrender)",
- "webrender_api 0.48.1 (git+https://github.com/servo/webrender)",
+ "webrender 0.49.0 (git+https://github.com/servo/webrender)",
+ "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
  "webvr 0.0.1",
  "webvr_traits 0.0.1",
 ]
@@ -1821,7 +1821,7 @@ dependencies = [
  "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.48.1 (git+https://github.com/servo/webrender)",
+ "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -1871,7 +1871,7 @@ dependencies = [
  "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.48.1 (git+https://github.com/servo/webrender)",
+ "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -1928,7 +1928,7 @@ dependencies = [
  "servo_url 0.0.1",
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.48.1 (git+https://github.com/servo/webrender)",
+ "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -2531,7 +2531,7 @@ dependencies = [
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "utf-8 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.48.1 (git+https://github.com/servo/webrender)",
+ "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
  "webvr 0.0.1",
  "webvr_traits 0.0.1",
  "xml5ever 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2564,7 +2564,7 @@ dependencies = [
  "servo_atoms 0.0.1",
  "servo_url 0.0.1",
  "style 0.0.1",
- "webrender_api 0.48.1 (git+https://github.com/servo/webrender)",
+ "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -2608,7 +2608,7 @@ dependencies = [
  "style_traits 0.0.1",
  "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.48.1 (git+https://github.com/servo/webrender)",
+ "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
  "webvr_traits 0.0.1",
 ]
 
@@ -3100,7 +3100,7 @@ dependencies = [
  "selectors 0.19.0",
  "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "servo_atoms 0.0.1",
- "webrender_api 0.48.1 (git+https://github.com/servo/webrender)",
+ "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -3480,8 +3480,8 @@ dependencies = [
 
 [[package]]
 name = "webrender"
-version = "0.48.1"
-source = "git+https://github.com/servo/webrender#48808d144c83bbcc06524cb32c945144b44b51a5"
+version = "0.49.0"
+source = "git+https://github.com/servo/webrender#1007a65c6dd1fdfb8b39d57d7faff3cae7b32e0c"
 dependencies = [
  "app_units 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3499,18 +3499,17 @@ dependencies = [
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "offscreen_gl_context 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "plane-split 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_profiler 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "webrender_api 0.48.1 (git+https://github.com/servo/webrender)",
+ "webrender_api 0.49.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
 name = "webrender_api"
-version = "0.48.1"
-source = "git+https://github.com/servo/webrender#48808d144c83bbcc06524cb32c945144b44b51a5"
+version = "0.49.0"
+source = "git+https://github.com/servo/webrender#1007a65c6dd1fdfb8b39d57d7faff3cae7b32e0c"
 dependencies = [
  "app_units 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3520,10 +3519,8 @@ dependencies = [
  "dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "offscreen_gl_context 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -3924,8 +3921,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.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d548aabf87411b1b4ba91fd07eacd8b238135c7131a452b8a9f6386209167e18"
-"checksum webrender 0.48.1 (git+https://github.com/servo/webrender)" = "<none>"
-"checksum webrender_api 0.48.1 (git+https://github.com/servo/webrender)" = "<none>"
+"checksum webrender 0.49.0 (git+https://github.com/servo/webrender)" = "<none>"
+"checksum webrender_api 0.49.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/canvas/Cargo.toml b/components/canvas/Cargo.toml
index e8bf234a052..d38f8c5aacc 100644
--- a/components/canvas/Cargo.toml
+++ b/components/canvas/Cargo.toml
@@ -19,6 +19,6 @@ gleam = "0.4"
 ipc-channel = "0.8"
 log = "0.3.5"
 num-traits = "0.1.32"
-offscreen_gl_context = { version = "0.11", features = ["serde"] }
+offscreen_gl_context = { version = "0.11", features = ["serde", "osmesa"] }
 webrender = {git = "https://github.com/servo/webrender"}
 webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index 93654eb71b0..c5ceec0aa1f 100644
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@@ -327,17 +327,6 @@ impl webrender_api::RenderNotifier for RenderNotifier {
     }
 }
 
-// Used to dispatch functions from webrender to the main thread's event loop.
-struct CompositorThreadDispatcher {
-    compositor_proxy: CompositorProxy
-}
-
-impl webrender_api::RenderDispatcher for CompositorThreadDispatcher {
-    fn dispatch(&self, f: Box<Fn() + Send>) {
-        self.compositor_proxy.send(Msg::Dispatch(f));
-    }
-}
-
 impl<Window: WindowMethods> IOCompositor<Window> {
     fn new(window: Rc<Window>, state: InitialCompositorState)
            -> IOCompositor<Window> {
@@ -394,15 +383,6 @@ impl<Window: WindowMethods> IOCompositor<Window> {
                                                   compositor.constellation_chan.clone());
         compositor.webrender.set_render_notifier(Box::new(render_notifier));
 
-        if cfg!(target_os = "windows") {
-            // Used to dispatch functions from webrender to the main thread's event loop.
-            // Required to allow WGL GLContext sharing in Windows.
-            let dispatcher = Box::new(CompositorThreadDispatcher {
-                compositor_proxy: compositor.channel_to_self.clone_compositor_proxy()
-            });
-            compositor.webrender.set_main_thread_dispatcher(dispatcher);
-        }
-
         // Set the size of the root layer.
         compositor.update_zoom_transform();