diff options
author | jbauman <jbauman@chromium.org> | 2015-11-20 12:12:46 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-20 20:13:43 +0000 |
commit | 915e16b393182f9ccc0ddc4caadd5f7744b25fd4 (patch) | |
tree | 995269d371fe690aeb9471c1e779f621e5ebba97 /cc/surfaces | |
parent | d06dd67fd692a59506e84a43516684398bb05af1 (diff) | |
download | chromium_src-915e16b393182f9ccc0ddc4caadd5f7744b25fd4.zip chromium_src-915e16b393182f9ccc0ddc4caadd5f7744b25fd4.tar.gz chromium_src-915e16b393182f9ccc0ddc4caadd5f7744b25fd4.tar.bz2 |
List all child surfaces (including occluded) in CompositorFrame
Then any occluded child surface with a copy request can be aggregated
(and have its copy done) whenever its parent draws.
BUG=529378
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1430363002
Cr-Commit-Position: refs/heads/master@{#360896}
Diffstat (limited to 'cc/surfaces')
-rw-r--r-- | cc/surfaces/surface.cc | 7 | ||||
-rw-r--r-- | cc/surfaces/surface_aggregator.cc | 66 | ||||
-rw-r--r-- | cc/surfaces/surface_aggregator.h | 12 | ||||
-rw-r--r-- | cc/surfaces/surface_aggregator_unittest.cc | 102 | ||||
-rw-r--r-- | cc/surfaces/surface_factory_unittest.cc | 4 |
5 files changed, 177 insertions, 14 deletions
diff --git a/cc/surfaces/surface.cc b/cc/surfaces/surface.cc index 8faff98..563415c 100644 --- a/cc/surfaces/surface.cc +++ b/cc/surfaces/surface.cc @@ -66,12 +66,7 @@ void Surface::QueueFrame(scoped_ptr<CompositorFrame> frame, std::vector<SurfaceId> new_referenced_surfaces; if (current_frame_) { - 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()); - } + new_referenced_surfaces = current_frame_->metadata.referenced_surfaces; } if (previous_frame) { diff --git a/cc/surfaces/surface_aggregator.cc b/cc/surfaces/surface_aggregator.cc index 4c1441a..181b07f 100644 --- a/cc/surfaces/surface_aggregator.cc +++ b/cc/surfaces/surface_aggregator.cc @@ -58,6 +58,10 @@ SurfaceAggregator::~SurfaceAggregator() { ProcessAddedAndRemovedSurfaces(); } +SurfaceAggregator::PrewalkResult::PrewalkResult() {} + +SurfaceAggregator::PrewalkResult::~PrewalkResult() {} + // Create a clip rect for an aggregated quad from the original clip rect and // the clip rect from the surface it's on. SurfaceAggregator::ClipData SurfaceAggregator::CalculateClipRect( @@ -491,7 +495,8 @@ void SurfaceAggregator::ProcessAddedAndRemovedSurfaces() { // Walk the Surface tree from surface_id. Validate the resources of the current // surface and its descendants, check if there are any copy requests, and // return the combined damage rect. -gfx::Rect SurfaceAggregator::PrewalkTree(SurfaceId surface_id) { +gfx::Rect SurfaceAggregator::PrewalkTree(SurfaceId surface_id, + PrewalkResult* result) { if (referenced_surfaces_.count(surface_id)) return gfx::Rect(); Surface* surface = manager_->GetSurfaceForId(surface_id); @@ -569,7 +574,7 @@ gfx::Rect SurfaceAggregator::PrewalkTree(SurfaceId surface_id) { provider_->DeclareUsedResourcesFromChild(child_id, referenced_resources); for (const auto& render_pass : frame_data->render_pass_list) - has_copy_requests_ |= !render_pass->copy_requests.empty(); + result->has_copy_requests |= !render_pass->copy_requests.empty(); gfx::Rect damage_rect; if (!frame_data->render_pass_list.empty()) { @@ -583,14 +588,63 @@ gfx::Rect SurfaceAggregator::PrewalkTree(SurfaceId surface_id) { SurfaceSet::iterator it = referenced_surfaces_.insert(surface->surface_id()).first; for (const auto& surface_info : child_surfaces) { - gfx::Rect surface_damage = PrewalkTree(surface_info.first); + gfx::Rect surface_damage = PrewalkTree(surface_info.first, result); damage_rect.Union( MathUtil::MapEnclosingClippedRect(surface_info.second, surface_damage)); } + + 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, result); + } + } + referenced_surfaces_.erase(it); 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); + const CompositorFrame* surface_frame = surface->GetEligibleFrame(); + if (!surface_frame) + continue; + bool surface_has_copy_requests = false; + 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 : 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(surface_frame->delegated_frame_data.get(), surface); + referenced_surfaces_.erase(it); + } + } +} + scoped_ptr<CompositorFrame> SurfaceAggregator::Aggregate(SurfaceId surface_id) { Surface* surface = manager_->GetSurfaceForId(surface_id); DCHECK(surface); @@ -609,9 +663,11 @@ scoped_ptr<CompositorFrame> SurfaceAggregator::Aggregate(SurfaceId surface_id) { dest_pass_list_ = &frame->delegated_frame_data->render_pass_list; valid_surfaces_.clear(); - has_copy_requests_ = false; - root_damage_rect_ = PrewalkTree(surface_id); + PrewalkResult prewalk_result; + root_damage_rect_ = PrewalkTree(surface_id, &prewalk_result); + has_copy_requests_ = prewalk_result.has_copy_requests; + CopyUndrawnSurfaces(&prewalk_result); SurfaceSet::iterator it = referenced_surfaces_.insert(surface_id).first; CopyPasses(root_surface_frame->delegated_frame_data.get(), surface); referenced_surfaces_.erase(it); diff --git a/cc/surfaces/surface_aggregator.h b/cc/surfaces/surface_aggregator.h index 738aeec..6df7e6b 100644 --- a/cc/surfaces/surface_aggregator.h +++ b/cc/surfaces/surface_aggregator.h @@ -60,6 +60,15 @@ class CC_SURFACES_EXPORT SurfaceAggregator { gfx::Rect rect; }; + struct PrewalkResult { + PrewalkResult(); + ~PrewalkResult(); + bool has_copy_requests = false; + // This is the set of Surfaces that were referenced by another Surface, but + // not included in a SurfaceDrawQuad. + std::set<SurfaceId> undrawn_surfaces; + }; + ClipData CalculateClipRect(const ClipData& surface_clip, const ClipData& quad_clip, const gfx::Transform& target_transform); @@ -83,7 +92,8 @@ class CC_SURFACES_EXPORT SurfaceAggregator { const ClipData& clip_rect, RenderPass* dest_pass, SurfaceId surface_id); - gfx::Rect PrewalkTree(SurfaceId surface_id); + gfx::Rect PrewalkTree(SurfaceId surface_id, PrewalkResult* result); + void CopyUndrawnSurfaces(PrewalkResult* prewalk); void CopyPasses(const DelegatedFrameData* frame_data, Surface* surface); // Remove Surfaces that were referenced before but aren't currently diff --git a/cc/surfaces/surface_aggregator_unittest.cc b/cc/surfaces/surface_aggregator_unittest.cc index 53b01e0..86eedf6 100644 --- a/cc/surfaces/surface_aggregator_unittest.cc +++ b/cc/surfaces/surface_aggregator_unittest.cc @@ -477,6 +477,108 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, RootCopyRequest) { factory_.Destroy(embedded_surface_id); } +TEST_F(SurfaceAggregatorValidSurfaceTest, UnreferencedSurface) { + SurfaceId embedded_surface_id = allocator_.GenerateId(); + factory_.Create(embedded_surface_id); + Surface* embedded_surface = manager_.GetSurfaceForId(embedded_surface_id); + EXPECT_FALSE(surface_aggregator_client_.HasSurface(embedded_surface)); + + test::Quad embedded_quads[] = {test::Quad::SolidColorQuad(SK_ColorGREEN)}; + test::Pass embedded_passes[] = { + test::Pass(embedded_quads, arraysize(embedded_quads))}; + + SubmitCompositorFrame(embedded_passes, arraysize(embedded_passes), + embedded_surface_id); + scoped_ptr<CopyOutputRequest> copy_request( + CopyOutputRequest::CreateEmptyRequest()); + CopyOutputRequest* copy_request_ptr = copy_request.get(); + factory_.RequestCopyOfSurface(embedded_surface_id, copy_request.Pass()); + + SurfaceId parent_surface_id = allocator_.GenerateId(); + factory_.Create(parent_surface_id); + Surface* parent_surface = manager_.GetSurfaceForId(parent_surface_id); + + test::Quad parent_quads[] = { + test::Quad::SolidColorQuad(SK_ColorWHITE), + test::Quad::SurfaceQuad(embedded_surface_id, 1.f), + test::Quad::SolidColorQuad(SK_ColorBLACK)}; + test::Pass parent_passes[] = { + test::Pass(parent_quads, arraysize(parent_quads))}; + + { + scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData); + AddPasses(&frame_data->render_pass_list, gfx::Rect(SurfaceSize()), + parent_passes, arraysize(parent_passes)); + + scoped_ptr<CompositorFrame> frame(new CompositorFrame); + frame->delegated_frame_data = frame_data.Pass(); + frame->metadata.referenced_surfaces.push_back(embedded_surface_id); + + factory_.SubmitCompositorFrame(parent_surface_id, frame.Pass(), + SurfaceFactory::DrawCallback()); + } + + test::Quad root_quads[] = {test::Quad::SolidColorQuad(SK_ColorWHITE), + test::Quad::SolidColorQuad(SK_ColorBLACK)}; + test::Pass root_passes[] = {test::Pass(root_quads, arraysize(root_quads))}; + + { + scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData); + AddPasses(&frame_data->render_pass_list, gfx::Rect(SurfaceSize()), + root_passes, arraysize(root_passes)); + + scoped_ptr<CompositorFrame> frame(new CompositorFrame); + frame->delegated_frame_data = frame_data.Pass(); + frame->metadata.referenced_surfaces.push_back(parent_surface_id); + + factory_.SubmitCompositorFrame(root_surface_id_, frame.Pass(), + SurfaceFactory::DrawCallback()); + } + + EXPECT_FALSE(surface_aggregator_client_.HasSurface(root_surface_)); + EXPECT_FALSE(surface_aggregator_client_.HasSurface(parent_surface)); + EXPECT_FALSE(surface_aggregator_client_.HasSurface(embedded_surface)); + + scoped_ptr<CompositorFrame> aggregated_frame = + aggregator_.Aggregate(root_surface_id_); + + EXPECT_TRUE(surface_aggregator_client_.HasSurface(root_surface_)); + EXPECT_TRUE(surface_aggregator_client_.HasSurface(parent_surface)); + EXPECT_TRUE(surface_aggregator_client_.HasSurface(embedded_surface)); + + ASSERT_TRUE(aggregated_frame); + ASSERT_TRUE(aggregated_frame->delegated_frame_data); + + DelegatedFrameData* frame_data = aggregated_frame->delegated_frame_data.get(); + + // First pass should come from surface that had a copy request but was not + // referenced directly. The second pass comes from the root surface. + // parent_quad should be ignored because it is neither referenced through a + // SurfaceDrawQuad nor has a copy request on it. + test::Pass expected_passes[] = { + test::Pass(embedded_quads, arraysize(embedded_quads)), + test::Pass(root_quads, arraysize(root_quads))}; + TestPassesMatchExpectations(expected_passes, arraysize(expected_passes), + &frame_data->render_pass_list); + ASSERT_EQ(2u, frame_data->render_pass_list.size()); + ASSERT_EQ(1u, frame_data->render_pass_list[0]->copy_requests.size()); + DCHECK_EQ(copy_request_ptr, + frame_data->render_pass_list[0]->copy_requests[0].get()); + + SurfaceId surface_ids[] = {root_surface_id_, parent_surface_id, + embedded_surface_id}; + EXPECT_EQ(arraysize(surface_ids), + aggregator_.previous_contained_surfaces().size()); + for (size_t i = 0; i < arraysize(surface_ids); i++) { + EXPECT_TRUE( + aggregator_.previous_contained_surfaces().find(surface_ids[i]) != + aggregator_.previous_contained_surfaces().end()); + } + + factory_.Destroy(parent_surface_id); + factory_.Destroy(embedded_surface_id); +} + // This tests referencing a surface that has multiple render passes. TEST_F(SurfaceAggregatorValidSurfaceTest, MultiPassSurfaceReference) { SurfaceId embedded_surface_id = child_allocator_.GenerateId(); diff --git a/cc/surfaces/surface_factory_unittest.cc b/cc/surfaces/surface_factory_unittest.cc index fa05c2e..749d7c5 100644 --- a/cc/surfaces/surface_factory_unittest.cc +++ b/cc/surfaces/surface_factory_unittest.cc @@ -490,10 +490,10 @@ TEST_F(SurfaceFactoryTest, DestroyCycle) { // Give id2 a frame that references surface_id_. { scoped_ptr<RenderPass> render_pass(RenderPass::Create()); - render_pass->referenced_surfaces.push_back(surface_id_); scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData); frame_data->render_pass_list.push_back(std::move(render_pass)); scoped_ptr<CompositorFrame> frame(new CompositorFrame); + frame->metadata.referenced_surfaces.push_back(surface_id_); frame->delegated_frame_data = std::move(frame_data); factory_->SubmitCompositorFrame(id2, std::move(frame), SurfaceFactory::DrawCallback()); @@ -503,10 +503,10 @@ TEST_F(SurfaceFactoryTest, DestroyCycle) { // Give surface_id_ a frame that references id2. { scoped_ptr<RenderPass> render_pass(RenderPass::Create()); - render_pass->referenced_surfaces.push_back(id2); scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData); frame_data->render_pass_list.push_back(std::move(render_pass)); scoped_ptr<CompositorFrame> frame(new CompositorFrame); + frame->metadata.referenced_surfaces.push_back(id2); frame->delegated_frame_data = std::move(frame_data); factory_->SubmitCompositorFrame(surface_id_, std::move(frame), SurfaceFactory::DrawCallback()); |