update deps

switch to using webrender_traits::ImageData

update use of webrender_traits::StackingContext in layout

use webrender_traits::channel::msg_channel in webgl ipc

fix use of resource_override_path in components/servo/lib

1 files changed, 4 insertions, 2 deletions

diff --git a/components/net/image_cache_thread.rs b/components/net/image_cache_thread.rs
index 71c70a03b28..5976ec50885 100644
--- a/components/net/image_cache_thread.rs
+++ b/components/net/image_cache_thread.rs
@@ -323,11 +323,12 @@ fn get_placeholder_image(webrender_api: &webrender_traits::RenderApi) -> io::Res
     let format = convert_format(image.format);
     let mut bytes = Vec::new();
     bytes.extend_from_slice(&*image.bytes);
+    let data = webrender_traits::ImageData::new(bytes);
     image.id = Some(webrender_api.add_image(image.width,
                                             image.height,
                                             None,
                                             format,
-                                            bytes));
+                                            data));
     Ok(Arc::new(image))
 }
 
@@ -482,11 +483,12 @@ impl ImageCache {
                 let format = convert_format(image.format);
                 let mut bytes = Vec::new();
                 bytes.extend_from_slice(&*image.bytes);
+                let data = webrender_traits::ImageData::new(bytes);
                 image.id = Some(self.webrender_api.add_image(image.width,
                                                              image.height,
                                                              None,
                                                              format,
-                                                             bytes));
+                                                             data));
             }
             LoadResult::PlaceholderLoaded(..) | LoadResult::None => {}
         }