Revert "Getting rid of DelegatedFrameData"

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>
 
 #include "base/bind.h"
 #include "base/containers/adapters.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/base/math_util.h"
 #include "cc/output/compositor_frame.h"
+#include "cc/output/delegated_frame_data.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_manager.h"
@@ skipping 150 matching lines @@
     const ClipData& clip_rect,
     RenderPass* dest_pass) {
   SurfaceId surface_id = surface_quad->surface_id;
   // If this surface's id is already in our referenced set then it creates
   // a cycle in the graph and should be dropped.
   if (referenced_surfaces_.count(surface_id))
     return;
   Surface* surface = manager_->GetSurfaceForId(surface_id);
   if (!surface)
     return;
-  if (!surface->HasFrame())
+  const CompositorFrame& frame = surface->GetEligibleFrame();
+  const DelegatedFrameData* frame_data = frame.delegated_frame_data.get();
+  if (!frame_data)
     return;
-  const CompositorFrame& frame = surface->GetEligibleFrame();
 
   std::multimap<RenderPassId, std::unique_ptr<CopyOutputRequest>> copy_requests;
   surface->TakeCopyOutputRequests(&copy_requests);
 
-  const RenderPassList& render_pass_list = frame.render_pass_list;
+  const RenderPassList& render_pass_list = frame_data->render_pass_list;
   if (!valid_surfaces_.count(surface->surface_id())) {
     for (auto& request : copy_requests)
       request.second->SendEmptyResult();
     return;
   }
 
   SurfaceSet::iterator it = referenced_surfaces_.insert(surface_id).first;
   // TODO(vmpstr): provider check is a hack for unittests that don't set up a
   // resource provider.
   ResourceProvider::ResourceIdMap empty_map;
@@ skipping 245 matching lines @@
 
           DCHECK_EQ(it->first, resource_id);
           ResourceId remapped_id = it->second;
           resource_id = remapped_id;
         }
       }
     }
   }
 }
 
-void SurfaceAggregator::CopyPasses(const CompositorFrame& frame,
+void SurfaceAggregator::CopyPasses(const DelegatedFrameData* frame_data,
                                    Surface* surface) {
   // The root surface is allowed to have copy output requests, so grab them
   // off its render passes.
   std::multimap<RenderPassId, std::unique_ptr<CopyOutputRequest>> copy_requests;
   surface->TakeCopyOutputRequests(&copy_requests);
 
-  const RenderPassList& source_pass_list = frame.render_pass_list;
+  const RenderPassList& source_pass_list = frame_data->render_pass_list;
   DCHECK(valid_surfaces_.count(surface->surface_id()));
   if (!valid_surfaces_.count(surface->surface_id()))
     return;
 
   // TODO(vmpstr): provider check is a hack for unittests that don't set up a
   // resource provider.
   ResourceProvider::ResourceIdMap empty_map;
   const ResourceProvider::ResourceIdMap& child_to_parent_map =
       provider_ ? provider_->GetChildToParentMap(ChildIdForSurface(surface))
                 : empty_map;
@@ skipping 65 matching lines @@
   base::WeakPtr<SurfaceAggregator> debug_weak_this = weak_factory_.GetWeakPtr();
 
   if (referenced_surfaces_.count(surface_id))
     return gfx::Rect();
   Surface* surface = manager_->GetSurfaceForId(surface_id);
   if (!surface) {
     contained_surfaces_[surface_id] = 0;
     return gfx::Rect();
   }
   contained_surfaces_[surface_id] = surface->frame_index();
-  if (!surface->HasFrame())
+  const CompositorFrame& surface_frame = surface->GetEligibleFrame();
+  const DelegatedFrameData* frame_data =
+      surface_frame.delegated_frame_data.get();
+  if (!frame_data)
     return gfx::Rect();
-  const CompositorFrame& frame = surface->GetEligibleFrame();
   int child_id = 0;
   // TODO(jbauman): hack for unit tests that don't set up rp
   if (provider_) {
     child_id = ChildIdForSurface(surface);
     if (surface->factory())
-      surface->factory()->RefResources(frame.resource_list);
-    provider_->ReceiveFromChild(child_id, frame.resource_list);
+      surface->factory()->RefResources(frame_data->resource_list);
+    provider_->ReceiveFromChild(child_id, frame_data->resource_list);
   }
   CHECK(debug_weak_this.get());
 
   ResourceProvider::ResourceIdSet referenced_resources;
-  size_t reserve_size = frame.resource_list.size();
+  size_t reserve_size = frame_data->resource_list.size();
   referenced_resources.reserve(reserve_size);
 
   bool invalid_frame = false;
   ResourceProvider::ResourceIdMap empty_map;
   const ResourceProvider::ResourceIdMap& child_to_parent_map =
       provider_ ? provider_->GetChildToParentMap(child_id) : empty_map;
 
   CHECK(debug_weak_this.get());
-  if (!frame.render_pass_list.empty()) {
+  if (!frame_data->render_pass_list.empty()) {
     RenderPassId remapped_pass_id =
-        RemapPassId(frame.render_pass_list.back()->id, surface_id);
+        RemapPassId(frame_data->render_pass_list.back()->id, surface_id);
     if (in_moved_pixel_pass)
       moved_pixel_passes_.insert(remapped_pass_id);
     if (parent_pass.IsValid())
       render_pass_dependencies_[parent_pass].insert(remapped_pass_id);
   }
 
   struct SurfaceInfo {
     SurfaceId id;
     bool has_moved_pixels;
     RenderPassId parent_pass;
     gfx::Transform target_to_surface_transform;
   };
   std::vector<SurfaceInfo> child_surfaces;
 
-  for (const auto& render_pass : base::Reversed(frame.render_pass_list)) {
+  for (const auto& render_pass : base::Reversed(frame_data->render_pass_list)) {
     RenderPassId remapped_pass_id = RemapPassId(render_pass->id, surface_id);
     bool in_moved_pixel_pass = !!moved_pixel_passes_.count(remapped_pass_id);
     for (auto* quad : render_pass->quad_list) {
       if (quad->material == DrawQuad::SURFACE_CONTENT) {
         const SurfaceDrawQuad* surface_quad =
             SurfaceDrawQuad::MaterialCast(quad);
         gfx::Transform target_to_surface_transform(
             render_pass->transform_to_root_target,
             surface_quad->shared_quad_state->quad_to_target_transform);
         child_surfaces.push_back(
@@ skipping 30 matching lines @@
     return gfx::Rect();
   CHECK(debug_weak_this.get());
   valid_surfaces_.insert(surface->surface_id());
 
   if (provider_)
     provider_->DeclareUsedResourcesFromChild(child_id, referenced_resources);
   CHECK(debug_weak_this.get());
 
   gfx::Rect damage_rect;
   gfx::Rect full_damage;
-  if (!frame.render_pass_list.empty()) {
-    RenderPass* last_pass = frame.render_pass_list.back().get();
+  if (!frame_data->render_pass_list.empty()) {
+    RenderPass* last_pass = frame_data->render_pass_list.back().get();
     full_damage = last_pass->output_rect;
     damage_rect =
         DamageRectForSurface(surface, *last_pass, last_pass->output_rect);
   }
 
   // Avoid infinite recursion by adding current surface to
   // referenced_surfaces_.
   SurfaceSet::iterator it =
       referenced_surfaces_.insert(surface->surface_id()).first;
   for (const auto& surface_info : child_surfaces) {
     gfx::Rect surface_damage =
         PrewalkTree(surface_info.id, surface_info.has_moved_pixels,
                     surface_info.parent_pass, result);
     if (surface_damage.IsEmpty())
       continue;
     if (surface_info.has_moved_pixels) {
       // Areas outside the rect hit by target_to_surface_transform may be
       // modified if there is a filter that moves pixels.
       damage_rect = full_damage;
       continue;
     }
 
     damage_rect.Union(MathUtil::MapEnclosingClippedRect(
         surface_info.target_to_surface_transform, surface_damage));
   }
 
   CHECK(debug_weak_this.get());
-  for (const auto& surface_id : frame.metadata.referenced_surfaces) {
+  for (const auto& surface_id : surface_frame.metadata.referenced_surfaces) {
     if (!contained_surfaces_.count(surface_id)) {
       result->undrawn_surfaces.insert(surface_id);
       PrewalkTree(surface_id, false, RenderPassId(), result);
     }
   }
 
   CHECK(debug_weak_this.get());
   if (surface->factory()) {
     surface->factory()->WillDrawSurface(surface->surface_id().local_frame_id(),
                                         damage_rect);
   }
 
   CHECK(debug_weak_this.get());
-  for (const auto& render_pass : frame.render_pass_list) {
+  for (const auto& render_pass : frame_data->render_pass_list) {
     if (!render_pass->copy_requests.empty()) {
       RenderPassId 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)
+  if (!damage_rect.IsEmpty() && surface_frame.metadata.may_contain_video)
     result->may_contain_video = true;
   return damage_rect;
 }
 
 void SurfaceAggregator::CopyUndrawnSurfaces(PrewalkResult* prewalk_result) {
   // undrawn_surfaces are Surfaces that were identified by prewalk as being
   // referenced by a drawn Surface, but aren't contained in a SurfaceDrawQuad.
   // They need to be iterated over to ensure that any copy requests on them
   // (or on Surfaces they reference) are executed.
   std::vector<SurfaceId> surfaces_to_copy(
       prewalk_result->undrawn_surfaces.begin(),
       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->HasFrame())
+    const CompositorFrame& surface_frame = surface->GetEligibleFrame();
+    if (!surface_frame.delegated_frame_data)
       continue;
-    const CompositorFrame& frame = surface->GetEligibleFrame();
     bool surface_has_copy_requests = false;
-    for (const auto& render_pass : frame.render_pass_list) {
+    for (const auto& render_pass :
+         surface_frame.delegated_frame_data->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) {
+      for (const auto& child_id : surface_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
         // recursion.
         if (!prewalk_result->undrawn_surfaces.count(child_id)) {
           surfaces_to_copy.push_back(child_id);
           prewalk_result->undrawn_surfaces.insert(child_id);
         }
       }
     } else {
       SurfaceSet::iterator it = referenced_surfaces_.insert(surface_id).first;
-      CopyPasses(frame, surface);
+      CopyPasses(surface_frame.delegated_frame_data.get(), surface);
       referenced_surfaces_.erase(it);
     }
   }
 }
 
 void SurfaceAggregator::PropagateCopyRequestPasses() {
   std::vector<RenderPassId> copy_requests_to_iterate(
       copy_request_passes_.begin(), copy_request_passes_.end());
   while (!copy_requests_to_iterate.empty()) {
     RenderPassId first = copy_requests_to_iterate.back();
     copy_requests_to_iterate.pop_back();
     auto it = render_pass_dependencies_.find(first);
     if (it == render_pass_dependencies_.end())
       continue;
     for (auto pass : it->second) {
       if (copy_request_passes_.insert(pass).second) {
         copy_requests_to_iterate.push_back(pass);
       }
     }
   }
 }
 
 CompositorFrame SurfaceAggregator::Aggregate(const SurfaceId& surface_id) {
   Surface* surface = manager_->GetSurfaceForId(surface_id);
   DCHECK(surface);
   contained_surfaces_[surface_id] = surface->frame_index();
-
-  if (!surface->HasFrame())
+  const CompositorFrame& root_surface_frame = surface->GetEligibleFrame();
+  if (!root_surface_frame.delegated_frame_data)
     return CompositorFrame();
-
-  const CompositorFrame& root_surface_frame = surface->GetEligibleFrame();
   TRACE_EVENT0("cc", "SurfaceAggregator::Aggregate");
 
   CompositorFrame frame;
+  frame.delegated_frame_data = base::WrapUnique(new DelegatedFrameData);
 
-  dest_resource_list_ = &frame.resource_list;
-  dest_pass_list_ = &frame.render_pass_list;
+  dest_resource_list_ = &frame.delegated_frame_data->resource_list;
+  dest_pass_list_ = &frame.delegated_frame_data->render_pass_list;
 
   valid_surfaces_.clear();
   PrewalkResult prewalk_result;
   root_damage_rect_ =
       PrewalkTree(surface_id, false, RenderPassId(), &prewalk_result);
   PropagateCopyRequestPasses();
   has_copy_requests_ = !copy_request_passes_.empty();
   frame.metadata.may_contain_video = prewalk_result.may_contain_video;
 
   CopyUndrawnSurfaces(&prewalk_result);
   SurfaceSet::iterator it = referenced_surfaces_.insert(surface_id).first;
-  CopyPasses(root_surface_frame, surface);
+  CopyPasses(root_surface_frame.delegated_frame_data.get(), surface);
   referenced_surfaces_.erase(it);
 
   moved_pixel_passes_.clear();
   copy_request_passes_.clear();
   render_pass_dependencies_.clear();
 
   DCHECK(referenced_surfaces_.empty());
 
   if (dest_pass_list_->empty())
     return CompositorFrame();
@@ skipping 28 matching lines @@
 
 void SurfaceAggregator::SetFullDamageForSurface(const SurfaceId& surface_id) {
   auto it = previous_contained_surfaces_.find(surface_id);
   if (it == previous_contained_surfaces_.end())
     return;
   // Set the last drawn index as 0 to ensure full damage next time it's drawn.
   it->second = 0;
 }
 
 }  // namespace cc