Bug 1355615 - Update wr_api_finalize_builder to take pointers on the C++ side to match the Rust side. r?jrmuizel draft
authorKartikaya Gupta <kgupta@mozilla.com>
Tue, 11 Apr 2017 17:29:04 -0400
changeset 560708 0a2bee2b4ea79d8c059a54eac083753ecd3f5093
parent 560707 dea911fa83afd01ee78789a0e2947c0d5f1eef81
child 560714 2a8d3a127aee5a3e74cb27af79946cb28e871909
push id53530
push userkgupta@mozilla.com
push dateTue, 11 Apr 2017 21:29:24 +0000
reviewersjrmuizel
bugs1355615
milestone55.0a1
Bug 1355615 - Update wr_api_finalize_builder to take pointers on the C++ side to match the Rust side. r?jrmuizel MozReview-Commit-ID: IskZgT17n42
gfx/webrender_bindings/WebRenderAPI.cpp
gfx/webrender_bindings/webrender_ffi.h
--- a/gfx/webrender_bindings/WebRenderAPI.cpp
+++ b/gfx/webrender_bindings/WebRenderAPI.cpp
@@ -512,20 +512,20 @@ DisplayListBuilder::End()
   wr_dp_end(mWrState);
 }
 
 BuiltDisplayList
 DisplayListBuilder::Finalize()
 {
   BuiltDisplayList dl;
   wr_api_finalize_builder(mWrState,
-                          dl.dl_desc,
-                          dl.dl.inner,
-                          dl.aux_desc,
-                          dl.aux.inner);
+                          &dl.dl_desc,
+                          &dl.dl.inner,
+                          &dl.aux_desc,
+                          &dl.aux.inner);
   return dl;
 }
 
 void
 DisplayListBuilder::PushStackingContext(const WrRect& aBounds,
                                         const float aOpacity,
                                         const gfx::Matrix4x4& aTransform,
                                         const WrMixBlendMode& aMixBlendMode)
--- a/gfx/webrender_bindings/webrender_ffi.h
+++ b/gfx/webrender_bindings/webrender_ffi.h
@@ -723,20 +723,20 @@ WR_INLINE void
 wr_dp_push_box_shadow(WrState* wrState, WrRect rect, WrClipRegion clip,
                       WrRect box_bounds, WrPoint offset, WrColor color,
                       float blur_radius, float spread_radius, float border_radius,
                       WrBoxShadowClipMode clip_mode)
 WR_FUNC;
 
 WR_INLINE void
 wr_api_finalize_builder(WrState* wrState,
-                        WrBuiltDisplayListDescriptor& dl_descriptor,
-                        WrVecU8& dl_data,
-                        WrAuxiliaryListsDescriptor& aux_descriptor,
-                        WrVecU8& aux_data)
+                        WrBuiltDisplayListDescriptor* dl_descriptor,
+                        WrVecU8* dl_data,
+                        WrAuxiliaryListsDescriptor* aux_descriptor,
+                        WrVecU8* aux_data)
 WR_FUNC;
 
 WR_INLINE void
 wr_dp_push_built_display_list(WrState* wrState,
                               WrBuiltDisplayListDescriptor dl_descriptor,
                               WrVecU8 dl_data,
                               WrAuxiliaryListsDescriptor aux_descriptor,
                               WrVecU8 aux_data)