Don't delete CopyOutputRequests when queueing a new Surface frame.

cc/surfaces/surface_aggregator.cc

 // 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.
 
 #include "cc/surfaces/surface_aggregator.h"
 
 #include <stddef.h>
 
 #include <map>
 
@@ skipping 692 matching lines @@
     }
   }
 
   CHECK(debug_weak_this.get());
   if (surface->factory()) {
     surface->factory()->WillDrawSurface(
         surface->surface_id().local_surface_id(), damage_rect);
   }
 
   CHECK(debug_weak_this.get());
+  if (surface->HasRootCopyRequests() && !frame.render_pass_list.empty()) {
+    int remapped_pass_id =
+        RemapPassId(frame.render_pass_list.back()->id, surface_id);
+    copy_request_passes_.insert(remapped_pass_id);
+  }
+
   for (const auto& render_pass : frame.render_pass_list) {
     if (!render_pass->copy_requests.empty()) {
       int remapped_pass_id = RemapPassId(render_pass->id, surface_id);
       copy_request_passes_.insert(remapped_pass_id);
     }
   }
 
   referenced_surfaces_.erase(it);
   if (!damage_rect.IsEmpty() && frame.metadata.may_contain_video)
     result->may_contain_video = true;
@@ skipping 10 matching lines @@
       prewalk_result->undrawn_surfaces.end());
 
   for (size_t i = 0; i < surfaces_to_copy.size(); i++) {
     SurfaceId surface_id = surfaces_to_copy[i];
     Surface* surface = manager_->GetSurfaceForId(surface_id);
     if (!surface)
       continue;
     if (!surface->HasActiveFrame())
       continue;
     const CompositorFrame& frame = surface->GetActiveFrame();
-    bool surface_has_copy_requests = false;
+    bool surface_has_copy_requests = surface->HasRootCopyRequests();
     for (const auto& render_pass : frame.render_pass_list) {
       surface_has_copy_requests |= !render_pass->copy_requests.empty();
     }
     if (!surface_has_copy_requests) {
       // Children are not necessarily included in undrawn_surfaces (because
       // they weren't referenced directly from a drawn surface), but may have
       // copy requests, so make sure to check them as well.
       for (const auto& child_id : frame.metadata.referenced_surfaces) {
         // Don't iterate over the child Surface if it was already listed as a
         // child of a different Surface, or in the case where there's infinite
@@ skipping 111 matching lines @@
   // Set the last drawn index as 0 to ensure full damage next time it's drawn.
   it->second = 0;
 }
 
 void SurfaceAggregator::SetOutputColorSpace(
     const gfx::ColorSpace& output_color_space) {
   output_color_space_ = output_color_space;
 }
 
 }  // namespace cc