Retain references to surfaces from both active AND pending CompositorFrames

cc/surfaces/surface.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 CC_SURFACES_SURFACE_H_
 #define CC_SURFACES_SURFACE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 83 matching lines @@
 
   // Satisfy all destruction dependencies that are contained in sequences, and
   // remove them from sequences.
   void SatisfyDestructionDependencies(
       std::unordered_set<SurfaceSequence, SurfaceSequenceHash>* sequences,
       std::unordered_set<FrameSinkId, FrameSinkIdHash>* valid_id_namespaces);
   size_t GetDestructionDependencyCount() const {
     return destruction_dependencies_.size();
   }
 
-  const std::vector<SurfaceId>& referenced_surfaces() const {
-    return referenced_surfaces_;
+  const std::vector<SurfaceId>& active_referenced_surfaces() const {
+    return active_referenced_surfaces_;
+  }
+
+  const std::vector<SurfaceId>& pending_referenced_surfaces() const {
+    return pending_referenced_surfaces_;
   }
 
   const SurfaceDependencies& blocking_surfaces_for_testing() const {
     return blocking_surfaces_;
   }
 
   bool HasActiveFrame() const { return active_frame_.has_value(); }
   bool HasPendingFrame() const { return pending_frame_.has_value(); }
 
   bool destroyed() const { return destroyed_; }
@@ skipping 17 matching lines @@
   base::Optional<CompositorFrame> pending_frame_;
   base::Optional<CompositorFrame> active_frame_;
   int frame_index_;
   bool destroyed_;
   std::vector<SurfaceSequence> destruction_dependencies_;
 
   // This surface may have multiple BeginFrameSources if it is
   // on multiple Displays.
   std::set<BeginFrameSource*> begin_frame_sources_;
 
-  // The total set of CompositorFrames referenced by the active CompositorFrame.
-  std::vector<SurfaceId> referenced_surfaces_;
+  // The set of SurfaceIds referenced by the active CompositorFrame.
+  // TODO(fsamuel): It seems unnecessary to copy this vector over
+  // from CompostiorFrameMetadata to store locally here. We can simply
+  // provide an accessor to the referenced surfaces directly from
+  // CompositorFrameMetadata.
+  std::vector<SurfaceId> active_referenced_surfaces_;
+
+  // The set of SurfaceIds referenced by the pending CompositorFrame.
+  // TODO(fsamuel): It seems unnecessary to copy this vector over
+  // from CompostiorFrameMetadata to store locally here. We can simply
+  // provide an accessor to the referenced surfaces directly from
+  // CompositorFrameMetadata.
+  std::vector<SurfaceId> pending_referenced_surfaces_;
 
   SurfaceDependencies blocking_surfaces_;
   base::ObserverList<PendingFrameObserver, true> observers_;
 
   DrawCallback draw_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(Surface);
 };
 
 using PendingSurfaceSet = base::flat_set<Surface*>;
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_H_