Bug 1505871. Pass DataStores to prepare_for_render. r=gw
authorTimothy Nikkel <tnikkel@gmail.com>
Tue, 26 Feb 2019 00:16:37 -0600
changeset 519011 461c14f8a14c04835454c9a836efffdafdf947e4
parent 519010 e1f278d901a765d0951f156a73a8dd3fad01a101
child 519012 457a27c7b181799671e43b99becb2420d03cdf62
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgw
bugs1505871
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1505871. Pass DataStores to prepare_for_render. r=gw We need this to get get filter data from the intern table.
gfx/wr/webrender/src/picture.rs
gfx/wr/webrender/src/prim_store/mod.rs
--- a/gfx/wr/webrender/src/picture.rs
+++ b/gfx/wr/webrender/src/picture.rs
@@ -2861,16 +2861,17 @@ impl PicturePrimitive {
     pub fn prepare_for_render(
         &mut self,
         pic_index: PictureIndex,
         prim_instance: &PrimitiveInstance,
         clipped_prim_bounding_rect: WorldRect,
         surface_index: SurfaceIndex,
         frame_context: &FrameBuildingContext,
         frame_state: &mut FrameBuildingState,
+        data_stores: &mut DataStores,
     ) -> bool {
         let (mut pic_state_for_children, pic_context) = self.take_state_and_context();
 
         if let Some(ref mut splitter) = pic_state_for_children.plane_splitter {
             self.resolve_split_planes(splitter, frame_state);
         }
 
         let raster_config = match self.raster_config {
--- a/gfx/wr/webrender/src/prim_store/mod.rs
+++ b/gfx/wr/webrender/src/prim_store/mod.rs
@@ -2299,16 +2299,17 @@ impl PrimitiveStore {
                 let prim_info = &scratch.prim_info[prim_instance.visibility_info.0 as usize];
                 if pic.prepare_for_render(
                     pic_index,
                     prim_instance,
                     prim_info.clipped_world_rect,
                     pic_context.surface_index,
                     frame_context,
                     frame_state,
+                    data_stores,
                 ) {
                     if let Some(ref mut splitter) = pic_state.plane_splitter {
                         PicturePrimitive::add_split_plane(
                             splitter,
                             frame_state.transforms,
                             prim_instance,
                             pic.local_rect,
                             &prim_info.combined_local_clip_rect,