Try to `use` WebRender types more

The newer versions of WebRender move types around between `webrender` and
`webrender_api` and this will reduce the churn during the upgrade.

1 files changed, 6 insertions, 5 deletions

diff --git a/components/net/image_cache.rs b/components/net/image_cache.rs
index 4b88fd5755e..08765d13d63 100644
--- a/components/net/image_cache.rs
+++ b/components/net/image_cache.rs
@@ -22,8 +22,9 @@ use std::collections::HashMap;
 use std::mem;
 use std::sync::{Arc, Mutex};
 use std::thread;
-use webrender_api::units::DeviceIntSize;
-use webrender_api::ImageDescriptorFlags;
+use webrender_api::{
+    units::DeviceIntSize, ImageData, ImageDescriptor, ImageDescriptorFlags, ImageFormat,
+};
 
 ///
 /// TODO(gw): Remaining work on image cache:
@@ -77,14 +78,14 @@ fn set_webrender_image_key(webrender_api: &WebrenderIpcSender, image: &mut Image
     };
     let mut flags = ImageDescriptorFlags::ALLOW_MIPMAPS;
     flags.set(ImageDescriptorFlags::IS_OPAQUE, is_opaque);
-    let descriptor = webrender_api::ImageDescriptor {
+    let descriptor = ImageDescriptor {
         size: DeviceIntSize::new(image.width as i32, image.height as i32),
         stride: None,
-        format: webrender_api::ImageFormat::BGRA8,
+        format: ImageFormat::BGRA8,
         offset: 0,
         flags,
     };
-    let data = webrender_api::ImageData::new(bytes);
+    let data = ImageData::new(bytes);
     let image_key = webrender_api.generate_image_key();
     webrender_api.add_image(image_key, descriptor, data);
     image.id = Some(image_key);