Make Surface::GetEligibleFrame const

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 "base/bind.h"
 #include "base/containers/hash_tables.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 79 matching lines @@
     return 0;
   }
 
   DCHECK_EQ(it->first, id);
   ResourceProvider::ResourceId remapped_id = it->second;
   resources_in_frame->push_back(id);
   return remapped_id;
 }
 
 bool SurfaceAggregator::TakeResources(Surface* surface,
-                                      DelegatedFrameData* frame_data) {
+                                      const DelegatedFrameData* frame_data,
+                                      RenderPassList* render_pass_list) {
+  RenderPass::CopyAll(frame_data->render_pass_list, render_pass_list);

[jamesr, 2014/07/24 19:55:47]

why do we need this copy?

   if (!provider_)  // TODO(jamesr): hack for unit tests that don't set up rp
     return false;
 
   int child_id = ChildIdForSurface(surface);
   provider_->ReceiveFromChild(child_id, frame_data->resource_list);
   surface->factory()->RefResources(frame_data->resource_list);
 
   typedef ResourceProvider::ResourceIdArray IdArray;
   IdArray referenced_resources;
 
   bool invalid_frame = false;
   DrawQuad::ResourceIteratorCallback remap =
       base::Bind(&ResourceRemapHelper,
                  &invalid_frame,
                  provider_->GetChildToParentMap(child_id),
                  &referenced_resources);
-  const RenderPassList& referenced_passes = frame_data->render_pass_list;
-  for (RenderPassList::const_iterator it = referenced_passes.begin();
-       it != referenced_passes.end();
+  for (RenderPassList::iterator it = render_pass_list->begin();
+       it != render_pass_list->end();
        ++it) {
-    const QuadList& quad_list = (*it)->quad_list;
-    for (QuadList::const_iterator quad_it = quad_list.begin();
+    QuadList& quad_list = (*it)->quad_list;
+    for (QuadList::iterator quad_it = quad_list.begin();
          quad_it != quad_list.end();
          ++quad_it) {
       (*quad_it)->IterateResources(remap);
     }
   }
   if (!invalid_frame)
     provider_->DeclareUsedResourcesFromChild(child_id, referenced_resources);
 
   return invalid_frame;
 }
 
 void SurfaceAggregator::HandleSurfaceQuad(const SurfaceDrawQuad* surface_quad,
                                           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;
-  CompositorFrame* frame = surface->GetEligibleFrame();
+  const CompositorFrame* frame = surface->GetEligibleFrame();
   if (!frame)
     return;
-  DelegatedFrameData* frame_data = frame->delegated_frame_data.get();
+  const DelegatedFrameData* frame_data = frame->delegated_frame_data.get();
   if (!frame_data)
     return;
 
-  bool invalid_frame = TakeResources(surface, frame_data);
+  RenderPassList render_pass_list;
+  bool invalid_frame = TakeResources(surface, frame_data, &render_pass_list);
   if (invalid_frame)
     return;
 
   SurfaceSet::iterator it = referenced_surfaces_.insert(surface_id).first;
 
-  const RenderPassList& referenced_passes = frame_data->render_pass_list;
+  const RenderPassList& referenced_passes = render_pass_list;
   for (size_t j = 0; j + 1 < referenced_passes.size(); ++j) {
     const RenderPass& source = *referenced_passes[j];
 
     scoped_ptr<RenderPass> copy_pass(RenderPass::Create());
 
     RenderPass::Id remapped_pass_id = RemapPassId(source.id, surface_id);
 
     copy_pass->SetAll(remapped_pass_id,
                       source.output_rect,
                       source.damage_rect,
@@ skipping 11 matching lines @@
     CopyQuadsToPass(source.quad_list,
                     source.shared_quad_state_list,
                     gfx::Transform(),
                     copy_pass.get(),
                     surface_id);
 
     dest_pass_list_->push_back(copy_pass.Pass());
   }
 
   // TODO(jamesr): Clean up last pass special casing.
-  const RenderPass& last_pass = *frame_data->render_pass_list.back();
+  const RenderPass& last_pass = *render_pass_list.back();
   const QuadList& quads = last_pass.quad_list;
 
   // TODO(jamesr): Make sure clipping is enforced.
   CopyQuadsToPass(quads,
                   last_pass.shared_quad_state_list,
                   surface_quad->quadTransform(),
                   dest_pass,
                   surface_id);
 
   referenced_surfaces_.erase(it);
@@ skipping 81 matching lines @@
                     copy_pass.get(),
                     surface_id);
 
     dest_pass_list_->push_back(copy_pass.Pass());
   }
 }
 
 scoped_ptr<CompositorFrame> SurfaceAggregator::Aggregate(SurfaceId surface_id) {
   Surface* surface = manager_->GetSurfaceForId(surface_id);
   DCHECK(surface);
-  CompositorFrame* root_surface_frame = surface->GetEligibleFrame();
+  const CompositorFrame* root_surface_frame = surface->GetEligibleFrame();
   if (!root_surface_frame)
     return scoped_ptr<CompositorFrame>();
   TRACE_EVENT0("cc", "SurfaceAggregator::Aggregate");
 
   scoped_ptr<CompositorFrame> frame(new CompositorFrame);
   frame->delegated_frame_data = make_scoped_ptr(new DelegatedFrameData);
 
   DCHECK(root_surface_frame->delegated_frame_data);
 
-  const RenderPassList& source_pass_list =
-      root_surface_frame->delegated_frame_data->render_pass_list;
+  RenderPassList source_pass_list;
 
   SurfaceSet::iterator it = referenced_surfaces_.insert(surface_id).first;
 
   dest_resource_list_ = &frame->delegated_frame_data->resource_list;
   dest_pass_list_ = &frame->delegated_frame_data->render_pass_list;
 
   bool invalid_frame =
-      TakeResources(surface, root_surface_frame->delegated_frame_data.get());
+      TakeResources(surface,
+                    root_surface_frame->delegated_frame_data.get(),
+                    &source_pass_list);
   DCHECK(!invalid_frame);
 
   CopyPasses(source_pass_list, surface_id);
 
   referenced_surfaces_.erase(it);
   DCHECK(referenced_surfaces_.empty());
 
   dest_pass_list_ = NULL;
 
   // TODO(jamesr): Aggregate all resource references into the returned frame's
   // resource list.
 
   return frame.Pass();
 }
 
 }  // namespace cc