diff options
author | Glenn Watson <github@intuitionlibrary.com> | 2017-02-27 08:54:28 +1000 |
---|---|---|
committer | Glenn Watson <github@intuitionlibrary.com> | 2017-02-27 08:54:28 +1000 |
commit | 64a9a45b2aa7fe942d7a3da97cc09c15e3b96874 (patch) | |
tree | 942253a33d873f7a6c4d3b0c13e0168c7ea6c7dc /components/net/image_cache_thread.rs | |
parent | 261df34ced0bdcb8126994c8653ac101d1172085 (diff) | |
download | servo-64a9a45b2aa7fe942d7a3da97cc09c15e3b96874.tar.gz servo-64a9a45b2aa7fe942d7a3da97cc09c15e3b96874.zip |
Update WR (image tiling, inset box shadow fixes, new key api).
Diffstat (limited to 'components/net/image_cache_thread.rs')
-rw-r--r-- | components/net/image_cache_thread.rs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/components/net/image_cache_thread.rs b/components/net/image_cache_thread.rs index 5beacb8a1a4..2ead7e06db6 100644 --- a/components/net/image_cache_thread.rs +++ b/components/net/image_cache_thread.rs @@ -326,10 +326,13 @@ fn get_placeholder_image(webrender_api: &webrender_traits::RenderApi) -> io::Res height: image.height, stride: None, format: format, + offset: 0, is_opaque: is_image_opaque(format, &bytes), }; let data = webrender_traits::ImageData::new(bytes); - image.id = Some(webrender_api.add_image(descriptor, data)); + let image_key = webrender_api.generate_image_key(); + webrender_api.add_image(image_key, descriptor, data, None); + image.id = Some(image_key); Ok(Arc::new(image)) } @@ -486,10 +489,13 @@ impl ImageCache { height: image.height, stride: None, format: format, + offset: 0, is_opaque: is_image_opaque(format, &bytes), }; let data = webrender_traits::ImageData::new(bytes); - image.id = Some(self.webrender_api.add_image(descriptor, data)); + let image_key = self.webrender_api.generate_image_key(); + self.webrender_api.add_image(image_key, descriptor, data, None); + image.id = Some(image_key); } LoadResult::PlaceholderLoaded(..) | LoadResult::None => {} } |