#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"
#include "cc/output/compositor_frame.h"
#include "cc/output/delegated_frame_data.h"
#include "cc/quads/shared_quad_state.h"
#include "cc/quads/surface_draw_quad.h"
#include "cc/surfaces/surface.h"
+#include "cc/surfaces/surface_factory.h"
#include "cc/surfaces/surface_manager.h"
namespace cc {
-SurfaceAggregator::SurfaceAggregator(SurfaceManager* manager)
- : manager_(manager) {
+SurfaceAggregator::SurfaceAggregator(SurfaceManager* manager,
+ ResourceProvider* provider)
+ : manager_(manager), provider_(provider) {
DCHECK(manager_);
}
SurfaceAggregator::~SurfaceAggregator() {}
-DelegatedFrameData* SurfaceAggregator::GetReferencedDataForSurfaceId(
- SurfaceId surface_id) {
- Surface* referenced_surface = manager_->GetSurfaceForId(surface_id);
- if (!referenced_surface)
- return NULL; // Invalid surface id, skip this quad.
- CompositorFrame* referenced_frame = referenced_surface->GetEligibleFrame();
- if (!referenced_frame)
- return NULL;
- return referenced_frame->delegated_frame_data.get();
-}
-
class SurfaceAggregator::RenderPassIdAllocator {
public:
- explicit RenderPassIdAllocator(int surface_id)
+ explicit RenderPassIdAllocator(SurfaceId surface_id)
: surface_id_(surface_id), next_index_(1) {}
~RenderPassIdAllocator() {}
RenderPass::Id Remap(RenderPass::Id id) {
DCHECK(id_to_index_map_.find(id) != id_to_index_map_.end());
- return RenderPass::Id(surface_id_, id_to_index_map_[id]);
+ return RenderPass::Id(surface_id_.id, id_to_index_map_[id]);
}
private:
base::hash_map<RenderPass::Id, int> id_to_index_map_;
- int surface_id_;
+ SurfaceId surface_id_;
int next_index_;
DISALLOW_COPY_AND_ASSIGN(RenderPassIdAllocator);
RenderPass::Id SurfaceAggregator::RemapPassId(
RenderPass::Id surface_local_pass_id,
- int surface_id) {
+ SurfaceId surface_id) {
RenderPassIdAllocator* allocator = render_pass_allocator_map_.get(surface_id);
if (!allocator) {
allocator = new RenderPassIdAllocator(surface_id);
return allocator->Remap(surface_local_pass_id);
}
+int SurfaceAggregator::ChildIdForSurface(Surface* surface) {
+ SurfaceToResourceChildIdMap::iterator it =
+ surface_id_to_resource_child_id_.find(surface->surface_id());
+ if (it == surface_id_to_resource_child_id_.end()) {
+ int child_id = provider_->CreateChild(base::Bind(
+ &SurfaceFactory::UnrefResources, surface->factory()->AsWeakPtr()));
+ surface_id_to_resource_child_id_[surface->surface_id()] = child_id;
+ return child_id;
+ } else {
+ return it->second;
+ }
+}
+
+static ResourceProvider::ResourceId ResourceRemapHelper(
+ bool* invalid_frame,
+ const ResourceProvider::ResourceIdMap& child_to_parent_map,
+ ResourceProvider::ResourceIdArray* resources_in_frame,
+ ResourceProvider::ResourceId id) {
+ ResourceProvider::ResourceIdMap::const_iterator it =
+ child_to_parent_map.find(id);
+ if (it == child_to_parent_map.end()) {
+ *invalid_frame = true;
+ 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,
+ const DelegatedFrameData* frame_data,
+ RenderPassList* render_pass_list) {
+ RenderPass::CopyAll(frame_data->render_pass_list, render_pass_list);
+ 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);
+ for (RenderPassList::iterator it = render_pass_list->begin();
+ it != render_pass_list->end();
+ ++it) {
+ 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.id))
+ if (referenced_surfaces_.count(surface_id))
+ return;
+ Surface* surface = manager_->GetSurfaceForId(surface_id);
+ if (!surface)
return;
- DelegatedFrameData* referenced_data =
- GetReferencedDataForSurfaceId(surface_id);
- if (!referenced_data)
+ const CompositorFrame* frame = surface->GetEligibleFrame();
+ if (!frame)
return;
- std::set<int>::iterator it = referenced_surfaces_.insert(surface_id.id).first;
+ const DelegatedFrameData* frame_data = frame->delegated_frame_data.get();
+ if (!frame_data)
+ return;
+
+ 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 = referenced_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.id);
+ RenderPass::Id remapped_pass_id = RemapPassId(source.id, surface_id);
copy_pass->SetAll(remapped_pass_id,
source.output_rect,
source.shared_quad_state_list,
gfx::Transform(),
copy_pass.get(),
- surface_id.id);
+ surface_id);
dest_pass_list_->push_back(copy_pass.Pass());
}
// TODO(jamesr): Clean up last pass special casing.
- const RenderPass& last_pass = *referenced_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.
last_pass.shared_quad_state_list,
surface_quad->quadTransform(),
dest_pass,
- surface_id.id);
+ surface_id);
referenced_surfaces_.erase(it);
}
const SharedQuadStateList& source_shared_quad_state_list,
const gfx::Transform& content_to_target_transform,
RenderPass* dest_pass,
- int surface_id) {
+ SurfaceId surface_id) {
const SharedQuadState* last_copied_source_shared_quad_state = NULL;
for (size_t i = 0, sqs_i = 0; i < source_quad_list.size(); ++i) {
RenderPass::Id remapped_pass_id =
RemapPassId(original_pass_id, surface_id);
- dest_pass->quad_list.push_back(
- pass_quad->Copy(dest_pass->shared_quad_state_list.back(),
- remapped_pass_id).PassAs<DrawQuad>());
+ dest_pass->CopyFromAndAppendRenderPassDrawQuad(
+ pass_quad,
+ dest_pass->shared_quad_state_list.back(),
+ remapped_pass_id);
} else {
- dest_pass->quad_list.push_back(
- quad->Copy(dest_pass->shared_quad_state_list.back()));
+ dest_pass->CopyFromAndAppendDrawQuad(
+ quad, dest_pass->shared_quad_state_list.back());
}
}
}
}
void SurfaceAggregator::CopyPasses(const RenderPassList& source_pass_list,
- int surface_id) {
+ SurfaceId surface_id) {
for (size_t i = 0; i < source_pass_list.size(); ++i) {
const RenderPass& source = *source_pass_list[i];
scoped_ptr<CompositorFrame> SurfaceAggregator::Aggregate(SurfaceId surface_id) {
Surface* surface = manager_->GetSurfaceForId(surface_id);
- if (!surface)
- return scoped_ptr<CompositorFrame>();
- CompositorFrame* root_surface_frame = surface->GetEligibleFrame();
+ DCHECK(surface);
+ 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;
- std::set<int>::iterator it = referenced_surfaces_.insert(surface_id.id).first;
+ 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;
- CopyPasses(source_pass_list, surface_id.id);
+
+ bool invalid_frame =
+ 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());
projects / platform / framework / web / crosswalk.git / blobdiff