Force use of and cache render surface.

components/viz/service/display/surface_aggregator.h

Index: components/viz/service/display/surface_aggregator.h
diff --git a/components/viz/service/display/surface_aggregator.h b/components/viz/service/display/surface_aggregator.h
index 9a14c892dc429a9b1c5232118b6a70e2d7c1de8b..72dd3bc7d104cc4c0ede3b85e8cdeb26cbae6e8b 100644
--- a/components/viz/service/display/surface_aggregator.h
+++ b/components/viz/service/display/surface_aggregator.h
@@ -201,6 +201,10 @@ class VIZ_SERVICE_EXPORT SurfaceAggregator {
   // 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 has damage from contributing
+  // content.
+  base::flat_set<cc::RenderPassId> contributing_content_damaged_passes_;
+
   // This maps each aggregated pass id to the set of (aggregated) pass ids
   // that its cc::RenderPassDrawQuads depend on
   base::flat_map<cc::RenderPassId, base::flat_set<cc::RenderPassId>>
@@ -213,6 +217,10 @@ class VIZ_SERVICE_EXPORT SurfaceAggregator {
   // This is valid during Aggregate after PrewalkTree is called.
   bool has_copy_requests_;
 
+  // True if the frame that's currently being aggregated has cached render
+  // passes. This is valid during Aggregate after PrewalkTree is called.
+  bool has_cached_render_passes_;
+
   // Tracks UMA stats for SurfaceDrawQuads during a call to Aggregate().
   SurfaceDrawQuadUmaStats uma_stats_;