Force use of and cache render surface.

components/viz/service/display/surface_aggregator.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_VIZ_SERVICE_DISPLAY_SURFACE_AGGREGATOR_H_
 #define COMPONENTS_VIZ_SERVICE_DISPLAY_SURFACE_AGGREGATOR_H_
 
 #include <memory>
 #include <unordered_map>
 
@@ skipping 119 matching lines @@
   void CopyUndrawnSurfaces(PrewalkResult* prewalk);
   void CopyPasses(const cc::CompositorFrame& frame, cc::Surface* surface);
   void AddColorConversionPass();
 
   // Remove Surfaces that were referenced before but aren't currently
   // referenced from the ResourceProvider.
   // Also notifies SurfaceAggregatorClient of newly added and removed
   // child surfaces.
   void ProcessAddedAndRemovedSurfaces();
 
-  void PropagateCopyRequestPasses();
+  void PropagatePasses(base::flat_set<cc::RenderPassId>* passes);

[danakj, 2017/07/19 22:52:55]

Please give the variable more context in the name than just the type

[wutao, 2017/07/21 05:59:24]

Related to the other comments. Do not need this modification any way.

 
   int ChildIdForSurface(cc::Surface* surface);
   gfx::Rect DamageRectForSurface(const cc::Surface* surface,
                                  const cc::RenderPass& source,
                                  const gfx::Rect& full_rect) const;
 
   static void UnrefResources(base::WeakPtr<cc::SurfaceClient> surface_client,
                              const std::vector<cc::ReturnedResource>& resources,
                              cc::BlockingTaskRunner* main_thread_task_runner);
 
@@ skipping 33 matching lines @@
   // For each Surface used in the last aggregation, gives the frame_index at
   // that time.
   SurfaceIndexMap previous_contained_surfaces_;
   SurfaceIndexMap contained_surfaces_;
 
   // After surface validation, every Surface in this set is valid.
   base::flat_set<SurfaceId> valid_surfaces_;
 
   // This is the pass list for the aggregated frame.
   cc::RenderPassList* dest_pass_list_;
+  // This maps pass id to itself.
+  base::flat_map<cc::RenderPassId, cc::RenderPass*> id_to_render_pass_map_;
 
   // This is the set of aggregated pass ids that are affected by filters that
   // move pixels.
   base::flat_set<cc::RenderPassId> moved_pixel_passes_;
 
   // This is the set of aggregated pass ids that are drawn by copy requests, so
   // should not have their damage rects clipped to the root damage rect.
   base::flat_set<cc::RenderPassId> copy_request_passes_;
 
+  // This is the set of aggregated pass ids that are drawn by force render
+  // surface, so should not have their damage rects clipped to the root damage
+  // rect.
+  base::flat_set<cc::RenderPassId> cached_render_surface_passes_;
+
   // This maps each aggregated pass id to the set of (aggregated) pass ids
   // that its RenderPassDrawQuads depend on
   base::flat_map<cc::RenderPassId, base::flat_set<cc::RenderPassId>>
       render_pass_dependencies_;
 
   // The root damage rect of the currently-aggregating frame.
   gfx::Rect root_damage_rect_;
 
   // True if the frame that's currently being aggregated has copy requests.
   // This is valid during Aggregate after PrewalkTree is called.
   bool has_copy_requests_;
 
+  // True if the frame that's currently being aggregated has force render
+  // surface. This is valid during Aggregate after PrewalkTree is called.
+  bool has_cached_render_surfaces_;
+
   // Tracks UMA stats for SurfaceDrawQuads during a call to Aggregate().
   SurfaceDrawQuadUmaStats uma_stats_;
 
   base::WeakPtrFactory<SurfaceAggregator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceAggregator);
 };
 
 }  // namespace viz
 
 #endif  // COMPONENTS_VIZ_SERVICE_DISPLAY_SURFACE_AGGREGATOR_H_