Backed out 3 changesets (bug 1924152, bug 1918138) for causing WR bustages. CLOSED TREE

Backed out changeset 03b773761f5d (bug 1924152)
Backed out changeset cedb2697277d (bug 1924152)
Backed out changeset 5a7a8a6c90aa (bug 1918138)

Author: Butkovits Atila

webrender/src/frame_builder.rs

@@ -274,7 +274,6 @@ impl FrameBuilder {
     fn build_layer_screen_rects_and_cull_layers(
         &mut self,
         scene: &mut BuiltScene,
-        present: bool,
         global_screen_world_rect: WorldRect,
         resource_cache: &mut ResourceCache,
         gpu_cache: &mut GpuCache,
@@ -295,8 +294,6 @@ impl FrameBuilder {
     ) {
         profile_scope!("build_layer_screen_rects_and_cull_layers");
 
-        let render_picture_cache_slices = present;
-
         let root_spatial_node_index = spatial_tree.root_reference_frame_index();
 
         const MAX_CLIP_COORD: f32 = 1.0e9;
@@ -430,9 +427,6 @@ impl FrameBuilder {
             }
 
             for pic_index in scene.tile_cache_pictures.iter().rev() {
-                if !render_picture_cache_slices {
-                    break;
-                }
                 let pic = &mut scene.prim_store.pictures[pic_index.0];
 
                 match pic.raster_config {
@@ -589,10 +583,6 @@ impl FrameBuilder {
         frame_state.push_dirty_region(default_dirty_region);
 
         for pic_index in &scene.tile_cache_pictures {
-            if !render_picture_cache_slices {
-                break;
-            }
-
             prepare_picture(
                 *pic_index,
                 &mut scene.prim_store,
@@ -627,7 +617,6 @@ impl FrameBuilder {
     pub fn build(
         &mut self,
         scene: &mut BuiltScene,
-        present: bool,
         resource_cache: &mut ResourceCache,
         gpu_cache: &mut GpuCache,
         rg_builder: &mut RenderTaskGraphBuilder,
@@ -693,7 +682,6 @@ impl FrameBuilder {
 
         self.build_layer_screen_rects_and_cull_layers(
             scene,
-            present,
             screen_world_rect,
             resource_cache,
             gpu_cache,
@@ -784,35 +772,33 @@ impl FrameBuilder {
                 passes.push(pass);
             }
 
-            if present {
-                let mut ctx = RenderTargetContext {
-                    global_device_pixel_scale,
-                    clip_store: &scene.clip_store,
-                    prim_store: &scene.prim_store,
-                    resource_cache,
-                    use_dual_source_blending,
-                    use_advanced_blending: scene.config.gpu_supports_advanced_blend,
-                    break_advanced_blend_batches: !scene.config.advanced_blend_is_coherent,
-                    batch_lookback_count: scene.config.batch_lookback_count,
-                    spatial_tree,
-                    data_stores,
-                    surfaces: &scene.surfaces,
-                    scratch: &mut scratch.primitive,
-                    screen_world_rect,
-                    globals: &self.globals,
-                    tile_caches,
-                    root_spatial_node_index: spatial_tree.root_reference_frame_index(),
-                    frame_memory: &mut frame_memory,
-                };
+            let mut ctx = RenderTargetContext {
+                global_device_pixel_scale,
+                clip_store: &scene.clip_store,
+                prim_store: &scene.prim_store,
+                resource_cache,
+                use_dual_source_blending,
+                use_advanced_blending: scene.config.gpu_supports_advanced_blend,
+                break_advanced_blend_batches: !scene.config.advanced_blend_is_coherent,
+                batch_lookback_count: scene.config.batch_lookback_count,
+                spatial_tree,
+                data_stores,
+                surfaces: &scene.surfaces,
+                scratch: &mut scratch.primitive,
+                screen_world_rect,
+                globals: &self.globals,
+                tile_caches,
+                root_spatial_node_index: spatial_tree.root_reference_frame_index(),
+                frame_memory: &mut frame_memory,
+            };
 
-                self.build_composite_pass(
-                    scene,
-                    &mut ctx,
-                    gpu_cache,
-                    &mut deferred_resolves,
-                    &mut composite_state,
-                );
-            }
+            self.build_composite_pass(
+                scene,
+                &mut ctx,
+                gpu_cache,
+                &mut deferred_resolves,
+                &mut composite_state,
+            );
         }
 
         profile.end_time(profiler::FRAME_BATCHING_TIME);
@@ -836,7 +822,6 @@ impl FrameBuilder {
                 device_origin,
                 scene.output_rect.size(),
             ),
-            present,
             passes,
             transform_palette: transform_palette.finish(),
             render_tasks,
@@ -1289,7 +1274,6 @@ pub fn build_render_pass(
 pub struct Frame {
     /// The rectangle to show the frame in, on screen.
     pub device_rect: DeviceIntRect,
-    pub present: bool,
     pub passes: FrameVec<RenderPass>,
 
     pub transform_palette: FrameVec<TransformData>,

webrender/src/render_api.rs

@@ -122,9 +122,6 @@ pub enum GenerateFrame {
         /// An id that allows tracking the frame transaction through the various
         /// frame stages. Specified by the caller of generate_frame().
         id: u64,
-        /// If false, (a subset of) the frame will be rendered, but nothing will
-        /// be presented on the window.
-        present: bool,
     },
     /// Don't generate a frame even if something has changed.
     No,
@@ -139,19 +136,10 @@ impl GenerateFrame {
         }
     }
 
-    /// If false, a frame may be (partially) generated but it will not be
-    /// presented to the window.
-    pub fn present(&self) -> bool {
-        match self {
-            GenerateFrame::Yes { present, .. } => *present,
-            GenerateFrame::No => false,
-        }
-    }
-
     /// Return the frame ID, if a frame is generated.
     pub fn id(&self) -> Option<u64> {
         match self {
-            GenerateFrame::Yes { id, .. } => Some(*id),
+            GenerateFrame::Yes { id } => Some(*id),
             GenerateFrame::No => None,
         }
     }
@@ -375,8 +363,8 @@ impl Transaction {
     /// as to when happened.
     ///
     /// [notifier]: trait.RenderNotifier.html#tymethod.new_frame_ready
-    pub fn generate_frame(&mut self, id: u64, present: bool, reasons: RenderReasons) {
-        self.generate_frame = GenerateFrame::Yes{ id, present };
+    pub fn generate_frame(&mut self, id: u64, reasons: RenderReasons) {
+        self.generate_frame = GenerateFrame::Yes{ id };
         self.render_reasons |= reasons;
     }
 

webrender/src/render_backend.rs

@@ -515,7 +515,6 @@ impl Document {
         debug_flags: DebugFlags,
         tile_caches: &mut FastHashMap<SliceId, Box<TileCacheInstance>>,
         frame_stats: Option<FullFrameStats>,
-        present: bool,
         render_reasons: RenderReasons,
         frame_memory: FrameMemory,
     ) -> RenderedDocument {
@@ -530,7 +529,6 @@ impl Document {
         let frame = {
             let frame = self.frame_builder.build(
                 &mut self.scene,
-                present,
                 resource_cache,
                 gpu_cache,
                 &mut self.rg_builder,
@@ -961,7 +959,6 @@ impl RenderBackend {
                 txn.frame_ops.take(),
                 txn.notifications.take(),
                 txn.render_frame,
-                txn.present,
                 RenderReasons::SCENE,
                 None,
                 txn.invalidate_rendered_frame,
@@ -1312,7 +1309,6 @@ impl RenderBackend {
                 txn.frame_ops.take(),
                 txn.notifications.take(),
                 txn.generate_frame.as_bool(),
-                txn.generate_frame.present(),
                 txn.render_reasons,
                 txn.generate_frame.id(),
                 txn.invalidate_rendered_frame,
@@ -1352,7 +1348,6 @@ impl RenderBackend {
                     Vec::default(),
                     Vec::default(),
                     false,
-                    false,
                     RenderReasons::empty(),
                     None,
                     false,
@@ -1375,7 +1370,6 @@ impl RenderBackend {
         mut frame_ops: Vec<FrameMsg>,
         mut notifications: Vec<NotificationRequest>,
         mut render_frame: bool,
-        present: bool,
         render_reasons: RenderReasons,
         generated_frame_id: Option<u64>,
         invalidate_rendered_frame: bool,
@@ -1475,7 +1469,6 @@ impl RenderBackend {
                     self.debug_flags,
                     &mut self.tile_caches,
                     frame_stats,
-                    present,
                     render_reasons,
                     frame_memory,
                 );
@@ -1682,7 +1675,6 @@ impl RenderBackend {
                     self.debug_flags,
                     &mut self.tile_caches,
                     None,
-                    true,
                     RenderReasons::empty(),
                     frame_memory,
                 );

webrender/src/renderer/mod.rs

@@ -1444,7 +1444,7 @@ impl Renderer {
         &mut self,
         doc_id: DocumentId,
         active_doc: &mut RenderedDocument,
-        mut device_size: Option<DeviceIntSize>,
+        device_size: Option<DeviceIntSize>,
         buffer_age: usize,
     ) -> Result<RenderResults, Vec<RendererError>> {
         profile_scope!("render");
@@ -1512,12 +1512,6 @@ impl Renderer {
             frame_id
         };
 
-        if !active_doc.frame.present {
-            // Setting device_size to None is what ensures compositing/presenting
-            // the frame is skipped in the rest of this module.
-            device_size = None;
-        }
-
         if let Some(device_size) = device_size {
             // Inform the client that we are starting a composition transaction if native
             // compositing is enabled. This needs to be done early in the frame, so that
@@ -3500,7 +3494,7 @@ impl Renderer {
             // to the swapchain tile list
             match tile.kind {
                 TileKind::Opaque | TileKind::Alpha => {
-                    // Store (index of tile, index of layer) so we can segment them below
+                    // Store (index of tile, index of layer) so we can segment them below 
                     occlusion.add(&rect, is_opaque, idx); // (idx, input_layers.len() - 1));
                 }
                 TileKind::Clear => {

webrender/src/scene_builder_thread.rs

@@ -69,7 +69,6 @@ pub struct BuiltTransaction {
     pub interner_updates: Option<InternerUpdates>,
     pub spatial_tree_updates: Option<SpatialTreeUpdates>,
     pub render_frame: bool,
-    pub present: bool,
     pub invalidate_rendered_frame: bool,
     pub profile: TransactionProfile,
     pub frame_stats: FullFrameStats,
@@ -478,7 +477,6 @@ impl SceneBuilderThread {
             let txns = vec![Box::new(BuiltTransaction {
                 document_id: item.document_id,
                 render_frame: item.build_frame,
-                present: true,
                 invalidate_rendered_frame: false,
                 built_scene,
                 view: item.view,
@@ -666,7 +664,6 @@ impl SceneBuilderThread {
         Box::new(BuiltTransaction {
             document_id: txn.document_id,
             render_frame: txn.generate_frame.as_bool(),
-            present: txn.generate_frame.present(),
             invalidate_rendered_frame: txn.invalidate_rendered_frame,
             built_scene,
             view: doc.view,

wrench/reftests/image/reftest.list

@@ -24,5 +24,3 @@ fuzzy(1,160000) == image-filter-stretch-tile.yaml green-alpha-ref.yaml
 == snapshot-detached.yaml snapshot-detached-ref.yaml
 == snapshot-filters-01.yaml snapshot-filters-01-ref.yaml
 == snapshot-filters-02.yaml snapshot-filters-02-ref.yaml
-fuzzy(1,350) == snapshot-shadow.yaml snapshot-shadow-ref.yaml
-== snapshot-multiframe.yaml snapshot-multiframe-ref.yaml