Bug 1370430 - Update BlobImageRenderer impl for API changes in WR cset 36a9117. r?jrmuizel draft
authorKartikaya Gupta <kgupta@mozilla.com>
Tue, 13 Jun 2017 11:15:37 -0400
changeset 593461 0ae722e8f9eafd9ef43ce178bcdf734f63168f5a
parent 593460 add50b495a31177073d63c88a2b5b82eee148bb7
child 633113 3886fc88c20cc8dc843d898badb0d704eb4b85b0
push id63697
push userkgupta@mozilla.com
push dateTue, 13 Jun 2017 15:18:49 +0000
reviewersjrmuizel
bugs1370430
milestone56.0a1
Bug 1370430 - Update BlobImageRenderer impl for API changes in WR cset 36a9117. r?jrmuizel MozReview-Commit-ID: JsO0XG0atjs
gfx/webrender_bindings/src/bindings.rs
--- a/gfx/webrender_bindings/src/bindings.rs
+++ b/gfx/webrender_bindings/src/bindings.rs
@@ -1782,20 +1782,20 @@ impl BlobImageRenderer for Moz2dImageRen
         self.images.insert(key, data);
     }
 
     fn delete(&mut self, key: ImageKey) {
         self.images.remove(&key);
     }
 
     fn request(&mut self,
+               _resources: &BlobImageResources,
                request: BlobImageRequest,
                descriptor: &BlobImageDescriptor,
-               _dirty_rect: Option<DeviceUintRect>,
-               _images: &ImageStore) {
+               _dirty_rect: Option<DeviceUintRect>) {
         let data = self.images.get(&request.key).unwrap();
         let buf_size = (descriptor.width * descriptor.height * descriptor.format.bytes_per_pixel().unwrap()) as usize;
         let mut output = vec![255u8; buf_size];
 
         unsafe {
             if wr_moz2d_render_cb(WrByteSlice::new(&data[..]),
                                   descriptor.width,
                                   descriptor.height,
@@ -1808,16 +1808,18 @@ impl BlobImageRenderer for Moz2dImageRen
                               data: output,
                           }));
             }
         }
     }
     fn resolve(&mut self, request: BlobImageRequest) -> BlobImageResult {
         self.rendered_images.remove(&request).unwrap_or(Err(BlobImageError::InvalidKey))
     }
+    fn delete_font(&mut self, _font: FontKey) {
+    }
 }
 
 impl Moz2dImageRenderer {
     fn new() -> Self {
         Moz2dImageRenderer {
             images: HashMap::new(),
             rendered_images: HashMap::new()
         }