Bug 1357392 - Update callback functions for new parameter added in d733af2. r?JerryShih draft
authorKartikaya Gupta <kgupta@mozilla.com>
Thu, 20 Apr 2017 10:50:26 -0400
changeset 565845 7121e93e70ef6829f5ed3523a4a230d6350b84c8
parent 565844 b35948507c3ec5ee62d2d5979dd65e5cb60fb4b3
child 565846 a772f95abb31554b94190b6ab6400b86ab8edef1
push id55031
push userkgupta@mozilla.com
push dateThu, 20 Apr 2017 14:51:39 +0000
reviewersJerryShih
bugs1357392
milestone55.0a1
Bug 1357392 - Update callback functions for new parameter added in d733af2. r?JerryShih MozReview-Commit-ID: I7sq1hPYJxx
gfx/webrender_bindings/src/bindings.rs
--- a/gfx/webrender_bindings/src/bindings.rs
+++ b/gfx/webrender_bindings/src/bindings.rs
@@ -544,17 +544,18 @@ type UnlockExternalImageCallback = fn(*m
 pub struct WrExternalImageHandler {
     external_image_obj: *mut c_void,
     lock_func: LockExternalImageCallback,
     unlock_func: UnlockExternalImageCallback,
 }
 
 impl ExternalImageHandler for WrExternalImageHandler {
     fn lock(&mut self,
-            id: ExternalImageId)
+            id: ExternalImageId,
+            _channel_index: u8)
             -> ExternalImage {
         let image = (self.lock_func)(self.external_image_obj, id.into());
 
         match image.image_type {
             WrExternalImageType::NativeTexture => {
                 ExternalImage {
                     u0: image.u0,
                     v0: image.v0,
@@ -571,17 +572,18 @@ impl ExternalImageHandler for WrExternal
                     v1: image.v1,
                     source: ExternalImageSource::RawData(unsafe { slice::from_raw_parts(image.buff, image.size) }),
                 }
             },
         }
     }
 
     fn unlock(&mut self,
-              id: ExternalImageId) {
+              id: ExternalImageId,
+              _channel_index: u8) {
         (self.unlock_func)(self.external_image_obj, id.into());
     }
 }
 
 /// cbindgen:field-names=[mHandle]
 /// cbindgen:struct-gen-op-lt=true
 /// cbindgen:struct-gen-op-lte=true
 #[repr(C)]
@@ -928,31 +930,33 @@ pub extern "C" fn wr_api_add_external_im
                                                    image_key: WrImageKey,
                                                    descriptor: &WrImageDescriptor,
                                                    external_image_id: WrExternalImageId) {
     assert!(unsafe { is_in_compositor_thread() });
     api.add_image(image_key,
                   descriptor.into(),
                   ImageData::External(ExternalImageData {
                                           id: external_image_id.into(),
+                                          channel_index: 0,
                                           image_type: ExternalImageType::Texture2DHandle,
                                       }),
                   None);
 }
 
 #[no_mangle]
 pub extern "C" fn wr_api_add_external_image_buffer(api: &mut WrAPI,
                                                    image_key: WrImageKey,
                                                    descriptor: &WrImageDescriptor,
                                                    external_image_id: WrExternalImageId) {
     assert!(unsafe { is_in_compositor_thread() });
     api.add_image(image_key,
                   descriptor.into(),
                   ImageData::External(ExternalImageData {
                                           id: external_image_id.into(),
+                                          channel_index: 0,
                                           image_type: ExternalImageType::ExternalBuffer,
                                       }),
                   None);
 }
 
 #[no_mangle]
 pub extern "C" fn wr_api_update_image(api: &mut WrAPI,
                                       key: WrImageKey,