cc: Introduce embedded_surfaces in metadata for surface Ids in draw quads

cc/surfaces/surface_dependency_tracker.cc

 // Copyright 2016 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_dependency_tracker.h"
 
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_info.h"
 #include "cc/surfaces/surface_manager.h"
 
@@ skipping 25 matching lines @@
 
 void SurfaceDependencyTracker::RequestSurfaceResolution(Surface* surface) {
   DCHECK(surface->HasPendingFrame());
 
   const CompositorFrame& pending_frame = surface->GetPendingFrame();
   bool needs_begin_frame =
       pending_frame.metadata.can_activate_before_dependencies;
 
   // Referenced surface IDs that aren't currently known to the surface manager
   // or do not have an active CompsotiorFrame block this frame.
-  for (const SurfaceId& surface_id :
-       pending_frame.metadata.referenced_surfaces) {
+  for (const SurfaceId& surface_id : pending_frame.metadata.embedded_surfaces) {
     Surface* surface_dependency = surface_manager_->GetSurfaceForId(surface_id);
     if (!surface_dependency || !surface_dependency->HasActiveFrame())
       blocked_surfaces_from_dependency_[surface_id].insert(
           surface->surface_id());
   }
 
   if (!observed_surfaces_by_id_.count(surface->surface_id())) {
     surface->AddObserver(this);
     observed_surfaces_by_id_.insert(surface->surface_id());
   }
@@ skipping 52 matching lines @@
     const std::vector<SurfaceId>* pending_referenced_surfaces) {}
 
 void SurfaceDependencyTracker::OnSurfaceDiscarded(Surface* surface) {
   // If the surface being destroyed doesn't have a pending frame then we have
   // nothing to do here.
   if (!surface->HasPendingFrame())
     return;
 
   const CompositorFrame& pending_frame = surface->GetPendingFrame();
 
-  DCHECK(!pending_frame.metadata.referenced_surfaces.empty());
+  DCHECK(!pending_frame.metadata.embedded_surfaces.empty());
 
-  for (const SurfaceId& surface_id :
-       pending_frame.metadata.referenced_surfaces) {
+  for (const SurfaceId& surface_id : pending_frame.metadata.embedded_surfaces) {
     auto it = blocked_surfaces_from_dependency_.find(surface_id);
     if (it == blocked_surfaces_from_dependency_.end())
       continue;
 
     auto& blocked_surface_ids = it->second;
     auto blocked_surface_ids_it =
         blocked_surface_ids.find(surface->surface_id());
     if (blocked_surface_ids_it != blocked_surface_ids.end()) {
       blocked_surface_ids.erase(surface->surface_id());
       if (blocked_surface_ids.empty())
@@ skipping 75 matching lines @@
       // A blocked surface may have been garbage collected during dependency
       // resolution.
       DCHECK(!observed_surfaces_by_id_.count(blocked_surface_by_id));
       continue;
     }
     blocked_surface->NotifySurfaceIdAvailable(surface_id);
   }
 }
 
 }  // namespace cc