Revert of List all child surfaces (including occluded) in CompositorFrame

cc/surfaces/surface.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.h"
 
 #include <algorithm>
 
 #include "cc/base/container_util.h"
 #include "cc/output/compositor_frame.h"
@@ skipping 48 matching lines @@
   }
 
   // Empty frames shouldn't be drawn and shouldn't contribute damage, so don't
   // increment frame index for them.
   if (current_frame_ &&
       !current_frame_->delegated_frame_data->render_pass_list.empty())
     ++frame_index_;
 
   std::vector<SurfaceId> new_referenced_surfaces;
   if (current_frame_) {
-    new_referenced_surfaces = current_frame_->metadata.referenced_surfaces;
+    for (auto& render_pass :
+         current_frame_->delegated_frame_data->render_pass_list) {
+      new_referenced_surfaces.insert(new_referenced_surfaces.end(),
+                                     render_pass->referenced_surfaces.begin(),
+                                     render_pass->referenced_surfaces.end());
+    }
   }
 
   if (previous_frame) {
     ReturnedResourceArray previous_resources;
     TransferableResource::ReturnResources(
         previous_frame->delegated_frame_data->resource_list,
         &previous_resources);
     factory_->UnrefResources(previous_resources);
   }
   if (!draw_callback_.is_null())
@@ skipping 113 matching lines @@
   if (current_frame_) {
     for (const auto& render_pass :
          current_frame_->delegated_frame_data->render_pass_list) {
       for (const auto& copy_request : render_pass->copy_requests)
         copy_request->SendEmptyResult();
     }
   }
 }
 
 }  // namespace cc