Bug 1362925 - Update webrender_bindings for cbindgen:0.1.7 r=kats

MozReview-Commit-ID: AwlqUWWEWfz

--HG--
extra : rebase_source : deace018f5d25f3eeecd5d4d683bb4f9a782a05c
extra : amend_source : 051d621e7b35e5389627b0946e7f87f0f8b9fa14

gfx/webrender_bindings/cbindgen.toml

@@ -0,0 +1,23 @@
+header = """/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */"""
+autogen_warning = """/* DO NOT MODIFY THIS MANUALLY! This file was generated using cbindgen.
+ * To generate this file, clone `https://github.com/rlhunt/cbindgen` or run `cargo install cbindgen`,
+ * then run `cbindgen gfx/webrender_bindings/ -o gfx/webrender_bindings/webrender_ffi_generated.h` */"""
+include_version = true
+braces = "SameLine"
+line_length = 100
+tab_width = 2
+language = "C++"
+
+[fn]
+prefix = "WR_INLINE"
+postfix = "WR_FUNC"
+args = "Vertical"
+rename_args = "GeckoCase"
+
+[struct]
+derive_eq = true
+
+[enum]
+add_sentinel = true

gfx/webrender_bindings/src/bindings.rs

@@ -34,12 +34,12 @@ type WrSideOffsets2Du32 = WrSideOffsets2D<u32>;
 type WrSideOffsets2Df32 = WrSideOffsets2D<f32>;
 
 /// cbindgen:field-names=[mHandle]
-/// cbindgen:struct-gen-op-lt=true
-/// cbindgen:struct-gen-op-lte=true
+/// cbindgen:derive-lt=true
+/// cbindgen:derive-lte=true
 type WrEpoch = Epoch;
 /// cbindgen:field-names=[mHandle]
-/// cbindgen:struct-gen-op-lt=true
-/// cbindgen:struct-gen-op-lte=true
+/// cbindgen:derive-lt=true
+/// cbindgen:derive-lte=true
 type WrIdNamespace = IdNamespace;
 
 /// cbindgen:field-names=[mNamespace, mHandle]
@@ -601,8 +601,8 @@ impl ExternalImageHandler for WrExternalImageHandler {
 }
 
 /// cbindgen:field-names=[mHandle]
-/// cbindgen:struct-gen-op-lt=true
-/// cbindgen:struct-gen-op-lte=true
+/// cbindgen:derive-lt=true
+/// cbindgen:derive-lte=true
 #[repr(C)]
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub struct WrWindowId(u64);
@@ -661,6 +661,7 @@ pub extern "C" fn wr_vec_u8_free(v: WrVecU8) {
     v.to_vec();
 }
 
+/// cbindgen:derive-eq=false
 #[repr(C)]
 #[derive(Debug)]
 pub struct WrTransformProperty {
@@ -808,7 +809,7 @@ pub extern "C" fn wr_renderer_current_epoch(renderer: &mut WrRenderer,
     return false;
 }
 
-/// cbindgen:function-postfix=WR_DESTRUCTOR_SAFE_FUNC
+/// cbindgen:postfix=WR_DESTRUCTOR_SAFE_FUNC
 #[no_mangle]
 pub unsafe extern "C" fn wr_renderer_delete(renderer: *mut WrRenderer) {
     Box::from_raw(renderer);
@@ -840,7 +841,7 @@ pub unsafe extern "C" fn wr_rendered_epochs_next(pipeline_epochs: &mut WrRendere
     return false;
 }
 
-/// cbindgen:function-postfix=WR_DESTRUCTOR_SAFE_FUNC
+/// cbindgen:postfix=WR_DESTRUCTOR_SAFE_FUNC
 #[no_mangle]
 pub unsafe extern "C" fn wr_rendered_epochs_delete(pipeline_epochs: *mut WrRenderedEpochs) {
     Box::from_raw(pipeline_epochs);
@@ -909,7 +910,7 @@ pub extern "C" fn wr_window_new(window_id: WrWindowId,
     return true;
 }
 
-/// cbindgen:function-postfix=WR_DESTRUCTOR_SAFE_FUNC
+/// cbindgen:postfix=WR_DESTRUCTOR_SAFE_FUNC
 #[no_mangle]
 pub unsafe extern "C" fn wr_api_delete(api: *mut WrAPI) {
     let api = Box::from_raw(api);
@@ -1103,7 +1104,7 @@ pub extern "C" fn wr_api_generate_frame_with_properties(api: &mut WrAPI,
     api.generate_frame(Some(properties));
 }
 
-/// cbindgen:function-postfix=WR_DESTRUCTOR_SAFE_FUNC
+/// cbindgen:postfix=WR_DESTRUCTOR_SAFE_FUNC
 #[no_mangle]
 pub extern "C" fn wr_api_send_external_event(api: &mut WrAPI,
                                              evt: usize) {
@@ -1181,7 +1182,7 @@ pub extern "C" fn wr_state_new(pipeline_id: WrPipelineId) -> *mut WrState {
     Box::into_raw(state)
 }
 
-/// cbindgen:function-postfix=WR_DESTRUCTOR_SAFE_FUNC
+/// cbindgen:postfix=WR_DESTRUCTOR_SAFE_FUNC
 #[no_mangle]
 pub extern "C" fn wr_state_delete(state: *mut WrState) {
     assert!(unsafe { is_in_main_thread() });

gfx/webrender_bindings/webrender_ffi.h

@@ -23,6 +23,8 @@ bool is_glcontext_egl(void* glcontext_ptr);
 void gfx_critical_note(const char* msg);
 void* get_proc_address_from_glcontext(void* glcontext_ptr, const char* procname);
 
+} // extern "C"
+
 // Some useful defines to stub out webrender binding functions for when we
 // build gecko without webrender. We try to tell the compiler these functions
 // are unreachable in that case, but VC++ emits a warning if it finds any
@@ -44,7 +46,6 @@ void* get_proc_address_from_glcontext(void* glcontext_ptr, const char* procname)
 
 #undef WR_FUNC
 #undef WR_DESTRUCTOR_SAFE_FUNC
-} // extern "C"
 
 struct WrGlyphArray
 {