Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2628)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/surfaces/surface_aggregator_unittest.cc

Issue 2098953003: Make cc::CompositorFrames movable [Part 2 of 2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed exo unittests Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/surfaces/surface_aggregator_perftest.cc ('k') | cc/surfaces/surface_display_output_surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/surface_aggregator_unittest.cc
diff --git a/cc/surfaces/surface_aggregator_unittest.cc b/cc/surfaces/surface_aggregator_unittest.cc
index 2ce40f14332da261bbd5adcaf6c1883e6d758c55..6e633263647547ce40d817f226bf2fc668686abc 100644
--- a/cc/surfaces/surface_aggregator_unittest.cc
+++ b/cc/surfaces/surface_aggregator_unittest.cc
@@ -81,8 +81,8 @@ TEST_F(SurfaceAggregatorTest, ValidSurfaceNoFrame) {
SurfaceId one_id(0, 7, 0);
factory_.Create(one_id);
- std::unique_ptr<CompositorFrame> frame = aggregator_.Aggregate(one_id);
- EXPECT_FALSE(frame);
+ CompositorFrame frame = aggregator_.Aggregate(one_id);
+ EXPECT_FALSE(frame.delegated_frame_data);
factory_.Destroy(one_id);
}
@@ -112,14 +112,12 @@ class SurfaceAggregatorValidSurfaceTest : public SurfaceAggregatorTest {
size_t expected_pass_count,
SurfaceId* surface_ids,
size_t expected_surface_count) {
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
DelegatedFrameData* frame_data =
- aggregated_frame->delegated_frame_data.get();
+ aggregated_frame.delegated_frame_data.get();
TestPassesMatchExpectations(
expected_passes, expected_pass_count, &frame_data->render_pass_list);
@@ -143,8 +141,8 @@ class SurfaceAggregatorValidSurfaceTest : public SurfaceAggregatorTest {
std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
pass_list->swap(frame_data->render_pass_list);
- std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
- frame->delegated_frame_data = std::move(frame_data);
+ CompositorFrame frame;
+ frame.delegated_frame_data = std::move(frame_data);
factory_.SubmitCompositorFrame(surface_id, std::move(frame),
SurfaceFactory::DrawCallback());
@@ -164,8 +162,8 @@ class SurfaceAggregatorValidSurfaceTest : public SurfaceAggregatorTest {
new DelegatedFrameData);
delegated_frame_data->render_pass_list.push_back(std::move(pass));
- std::unique_ptr<CompositorFrame> child_frame(new CompositorFrame);
- child_frame->delegated_frame_data = std::move(delegated_frame_data);
+ CompositorFrame child_frame;
+ child_frame.delegated_frame_data = std::move(delegated_frame_data);
factory_.SubmitCompositorFrame(surface_id, std::move(child_frame),
SurfaceFactory::DrawCallback());
@@ -213,13 +211,11 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, OpacityCopied) {
SubmitCompositorFrame(passes, arraysize(passes), root_surface_id_);
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
- DelegatedFrameData* frame_data = aggregated_frame->delegated_frame_data.get();
+ DelegatedFrameData* frame_data = aggregated_frame.delegated_frame_data.get();
RenderPassList& render_pass_list(frame_data->render_pass_list);
ASSERT_EQ(2u, render_pass_list.size());
@@ -309,13 +305,11 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, CopyRequest) {
SubmitCompositorFrame(root_passes, arraysize(root_passes), root_surface_id_);
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
- DelegatedFrameData* frame_data = aggregated_frame->delegated_frame_data.get();
+ DelegatedFrameData* frame_data = aggregated_frame.delegated_frame_data.get();
test::Quad expected_quads[] = {
test::Quad::SolidColorQuad(SK_ColorWHITE),
@@ -381,20 +375,18 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, RootCopyRequest) {
std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
pass_list.swap(frame_data->render_pass_list);
- std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
- frame->delegated_frame_data = std::move(frame_data);
+ CompositorFrame frame;
+ frame.delegated_frame_data = std::move(frame_data);
factory_.SubmitCompositorFrame(root_surface_id_, std::move(frame),
SurfaceFactory::DrawCallback());
}
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
- DelegatedFrameData* frame_data = aggregated_frame->delegated_frame_data.get();
+ DelegatedFrameData* frame_data = aggregated_frame.delegated_frame_data.get();
test::Quad expected_quads[] = {test::Quad::SolidColorQuad(SK_ColorWHITE),
test::Quad::SolidColorQuad(SK_ColorGREEN),
@@ -423,10 +415,10 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, RootCopyRequest) {
}
// Ensure copy requests have been removed from root surface.
- const CompositorFrame* original_frame =
+ const CompositorFrame& original_frame =
manager_.GetSurfaceForId(root_surface_id_)->GetEligibleFrame();
RenderPassList& original_pass_list =
- original_frame->delegated_frame_data->render_pass_list;
+ original_frame.delegated_frame_data->render_pass_list;
ASSERT_EQ(2u, original_pass_list.size());
DCHECK(original_pass_list[0]->copy_requests.empty());
DCHECK(original_pass_list[1]->copy_requests.empty());
@@ -465,9 +457,9 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, UnreferencedSurface) {
AddPasses(&frame_data->render_pass_list, gfx::Rect(SurfaceSize()),
parent_passes, arraysize(parent_passes));
- std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
- frame->delegated_frame_data = std::move(frame_data);
- frame->metadata.referenced_surfaces.push_back(embedded_surface_id);
+ CompositorFrame frame;
+ frame.delegated_frame_data = std::move(frame_data);
+ frame.metadata.referenced_surfaces.push_back(embedded_surface_id);
factory_.SubmitCompositorFrame(parent_surface_id, std::move(frame),
SurfaceFactory::DrawCallback());
@@ -482,24 +474,22 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, UnreferencedSurface) {
AddPasses(&frame_data->render_pass_list, gfx::Rect(SurfaceSize()),
root_passes, arraysize(root_passes));
- std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
- frame->delegated_frame_data = std::move(frame_data);
- frame->metadata.referenced_surfaces.push_back(parent_surface_id);
+ CompositorFrame frame;
+ frame.delegated_frame_data = std::move(frame_data);
+ frame.metadata.referenced_surfaces.push_back(parent_surface_id);
// Reference to Surface ID of a Surface that doesn't exist should be
// included in previous_contained_surfaces, but otherwise ignored.
- frame->metadata.referenced_surfaces.push_back(nonexistent_surface_id);
+ frame.metadata.referenced_surfaces.push_back(nonexistent_surface_id);
factory_.SubmitCompositorFrame(root_surface_id_, std::move(frame),
SurfaceFactory::DrawCallback());
}
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
- DelegatedFrameData* frame_data = aggregated_frame->delegated_frame_data.get();
+ 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.
@@ -561,13 +551,11 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, MultiPassSurfaceReference) {
SubmitCompositorFrame(root_passes, arraysize(root_passes), root_surface_id_);
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
- DelegatedFrameData* frame_data = aggregated_frame->delegated_frame_data.get();
+ DelegatedFrameData* frame_data = aggregated_frame.delegated_frame_data.get();
const RenderPassList& aggregated_pass_list = frame_data->render_pass_list;
@@ -797,13 +785,11 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, RenderPassIdMapping) {
SubmitCompositorFrame(parent_passes, arraysize(parent_passes),
root_surface_id_);
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
- DelegatedFrameData* frame_data = aggregated_frame->delegated_frame_data.get();
+ DelegatedFrameData* frame_data = aggregated_frame.delegated_frame_data.get();
const RenderPassList& aggregated_pass_list = frame_data->render_pass_list;
@@ -960,13 +946,11 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateSharedQuadStateProperties) {
QueuePassAsFrame(std::move(root_pass), root_surface_id_);
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
- DelegatedFrameData* frame_data = aggregated_frame->delegated_frame_data.get();
+ DelegatedFrameData* frame_data = aggregated_frame.delegated_frame_data.get();
const RenderPassList& aggregated_pass_list = frame_data->render_pass_list;
@@ -1041,8 +1025,8 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateMultiplePassWithTransform) {
new DelegatedFrameData);
child_pass_list.swap(child_frame_data->render_pass_list);
- std::unique_ptr<CompositorFrame> child_frame(new CompositorFrame);
- child_frame->delegated_frame_data = std::move(child_frame_data);
+ CompositorFrame child_frame;
+ child_frame.delegated_frame_data = std::move(child_frame_data);
factory_.SubmitCompositorFrame(child_surface_id, std::move(child_frame),
SurfaceFactory::DrawCallback());
@@ -1073,8 +1057,8 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateMultiplePassWithTransform) {
new DelegatedFrameData);
middle_pass_list.swap(middle_frame_data->render_pass_list);
- std::unique_ptr<CompositorFrame> middle_frame(new CompositorFrame);
- middle_frame->delegated_frame_data = std::move(middle_frame_data);
+ CompositorFrame middle_frame;
+ middle_frame.delegated_frame_data = std::move(middle_frame_data);
factory_.SubmitCompositorFrame(middle_surface_id, std::move(middle_frame),
SurfaceFactory::DrawCallback());
@@ -1109,19 +1093,17 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateMultiplePassWithTransform) {
std::unique_ptr<DelegatedFrameData> root_frame_data(new DelegatedFrameData);
root_pass_list.swap(root_frame_data->render_pass_list);
- std::unique_ptr<CompositorFrame> root_frame(new CompositorFrame);
- root_frame->delegated_frame_data = std::move(root_frame_data);
+ CompositorFrame root_frame;
+ root_frame.delegated_frame_data = std::move(root_frame_data);
factory_.SubmitCompositorFrame(root_surface_id_, std::move(root_frame),
SurfaceFactory::DrawCallback());
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
- DelegatedFrameData* frame_data = aggregated_frame->delegated_frame_data.get();
+ DelegatedFrameData* frame_data = aggregated_frame.delegated_frame_data.get();
const RenderPassList& aggregated_pass_list = frame_data->render_pass_list;
@@ -1216,8 +1198,8 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateDamageRect) {
std::unique_ptr<DelegatedFrameData> child_frame_data(new DelegatedFrameData);
child_pass_list.swap(child_frame_data->render_pass_list);
- std::unique_ptr<CompositorFrame> child_frame(new CompositorFrame);
- child_frame->delegated_frame_data = std::move(child_frame_data);
+ CompositorFrame child_frame;
+ child_frame.delegated_frame_data = std::move(child_frame_data);
SurfaceId child_surface_id = allocator_.GenerateId();
factory_.Create(child_surface_id);
@@ -1242,8 +1224,8 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateDamageRect) {
new DelegatedFrameData);
parent_surface_pass_list.swap(parent_surface_frame_data->render_pass_list);
- std::unique_ptr<CompositorFrame> parent_surface_frame(new CompositorFrame);
- parent_surface_frame->delegated_frame_data =
+ CompositorFrame parent_surface_frame;
+ parent_surface_frame.delegated_frame_data =
std::move(parent_surface_frame_data);
SurfaceId parent_surface_id = allocator_.GenerateId();
@@ -1278,19 +1260,17 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateDamageRect) {
std::unique_ptr<DelegatedFrameData> root_frame_data(new DelegatedFrameData);
root_pass_list.swap(root_frame_data->render_pass_list);
- std::unique_ptr<CompositorFrame> root_frame(new CompositorFrame);
- root_frame->delegated_frame_data = std::move(root_frame_data);
+ CompositorFrame root_frame;
+ root_frame.delegated_frame_data = std::move(root_frame_data);
factory_.SubmitCompositorFrame(root_surface_id_, std::move(root_frame),
SurfaceFactory::DrawCallback());
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
- DelegatedFrameData* frame_data = aggregated_frame->delegated_frame_data.get();
+ DelegatedFrameData* frame_data = aggregated_frame.delegated_frame_data.get();
const RenderPassList& aggregated_pass_list = frame_data->render_pass_list;
@@ -1316,20 +1296,18 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateDamageRect) {
new DelegatedFrameData);
child_pass_list.swap(child_frame_data->render_pass_list);
- std::unique_ptr<CompositorFrame> child_frame(new CompositorFrame);
- child_frame->delegated_frame_data = std::move(child_frame_data);
+ CompositorFrame child_frame;
+ child_frame.delegated_frame_data = std::move(child_frame_data);
factory_.SubmitCompositorFrame(child_surface_id, std::move(child_frame),
SurfaceFactory::DrawCallback());
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
DelegatedFrameData* frame_data =
- aggregated_frame->delegated_frame_data.get();
+ aggregated_frame.delegated_frame_data.get();
const RenderPassList& aggregated_pass_list = frame_data->render_pass_list;
@@ -1356,8 +1334,8 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateDamageRect) {
std::unique_ptr<DelegatedFrameData> root_frame_data(new DelegatedFrameData);
root_pass_list.swap(root_frame_data->render_pass_list);
- std::unique_ptr<CompositorFrame> root_frame(new CompositorFrame);
- root_frame->delegated_frame_data = std::move(root_frame_data);
+ CompositorFrame root_frame;
+ root_frame.delegated_frame_data = std::move(root_frame_data);
factory_.SubmitCompositorFrame(root_surface_id_, std::move(root_frame),
SurfaceFactory::DrawCallback());
@@ -1378,20 +1356,18 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateDamageRect) {
std::unique_ptr<DelegatedFrameData> root_frame_data(new DelegatedFrameData);
root_pass_list.swap(root_frame_data->render_pass_list);
- std::unique_ptr<CompositorFrame> root_frame(new CompositorFrame);
- root_frame->delegated_frame_data = std::move(root_frame_data);
+ CompositorFrame root_frame;
+ root_frame.delegated_frame_data = std::move(root_frame_data);
factory_.SubmitCompositorFrame(root_surface_id_, std::move(root_frame),
SurfaceFactory::DrawCallback());
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
DelegatedFrameData* frame_data =
- aggregated_frame->delegated_frame_data.get();
+ aggregated_frame.delegated_frame_data.get();
const RenderPassList& aggregated_pass_list = frame_data->render_pass_list;
@@ -1405,14 +1381,12 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateDamageRect) {
// No Surface changed, so no damage should be given.
{
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
DelegatedFrameData* frame_data =
- aggregated_frame->delegated_frame_data.get();
+ aggregated_frame.delegated_frame_data.get();
const RenderPassList& aggregated_pass_list = frame_data->render_pass_list;
@@ -1425,14 +1399,12 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateDamageRect) {
// marked as damaged.
{
aggregator_.SetFullDamageForSurface(root_surface_id_);
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
DelegatedFrameData* frame_data =
- aggregated_frame->delegated_frame_data.get();
+ aggregated_frame.delegated_frame_data.get();
const RenderPassList& aggregated_pass_list = frame_data->render_pass_list;
@@ -1463,21 +1435,19 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, SwitchSurfaceDamage) {
std::unique_ptr<DelegatedFrameData> root_frame_data(new DelegatedFrameData);
root_pass_list.swap(root_frame_data->render_pass_list);
- std::unique_ptr<CompositorFrame> root_frame(new CompositorFrame);
- root_frame->delegated_frame_data = std::move(root_frame_data);
+ CompositorFrame root_frame;
+ root_frame.delegated_frame_data = std::move(root_frame_data);
factory_.SubmitCompositorFrame(root_surface_id_, std::move(root_frame),
SurfaceFactory::DrawCallback());
{
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
DelegatedFrameData* frame_data =
- aggregated_frame->delegated_frame_data.get();
+ aggregated_frame.delegated_frame_data.get();
const RenderPassList& aggregated_pass_list = frame_data->render_pass_list;
@@ -1505,8 +1475,8 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, SwitchSurfaceDamage) {
std::unique_ptr<DelegatedFrameData> root_frame_data(new DelegatedFrameData);
root_pass_list.swap(root_frame_data->render_pass_list);
- std::unique_ptr<CompositorFrame> root_frame(new CompositorFrame);
- root_frame->delegated_frame_data = std::move(root_frame_data);
+ CompositorFrame root_frame;
+ root_frame.delegated_frame_data = std::move(root_frame_data);
factory_.Create(second_root_surface_id);
factory_.SubmitCompositorFrame(second_root_surface_id,
@@ -1515,14 +1485,13 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, SwitchSurfaceDamage) {
factory_.SetPreviousFrameSurface(second_root_surface_id, root_surface_id_);
}
{
- std::unique_ptr<CompositorFrame> aggregated_frame =
+ CompositorFrame aggregated_frame =
aggregator_.Aggregate(second_root_surface_id);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
DelegatedFrameData* frame_data =
- aggregated_frame->delegated_frame_data.get();
+ aggregated_frame.delegated_frame_data.get();
const RenderPassList& aggregated_pass_list = frame_data->render_pass_list;
@@ -1533,14 +1502,13 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, SwitchSurfaceDamage) {
EXPECT_EQ(gfx::Rect(1, 2, 3, 4), aggregated_pass_list[0]->damage_rect);
}
{
- std::unique_ptr<CompositorFrame> aggregated_frame =
+ CompositorFrame aggregated_frame =
aggregator_.Aggregate(second_root_surface_id);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
DelegatedFrameData* frame_data =
- aggregated_frame->delegated_frame_data.get();
+ aggregated_frame.delegated_frame_data.get();
const RenderPassList& aggregated_pass_list = frame_data->render_pass_list;
@@ -1619,13 +1587,11 @@ TEST_F(SurfaceAggregatorPartialSwapTest, IgnoreOutside) {
SubmitPassListAsFrame(root_surface_id_, &root_pass_list);
}
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
- DelegatedFrameData* frame_data = aggregated_frame->delegated_frame_data.get();
+ DelegatedFrameData* frame_data = aggregated_frame.delegated_frame_data.get();
const RenderPassList& aggregated_pass_list = frame_data->render_pass_list;
@@ -1655,14 +1621,12 @@ TEST_F(SurfaceAggregatorPartialSwapTest, IgnoreOutside) {
}
{
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
DelegatedFrameData* frame_data =
- aggregated_frame->delegated_frame_data.get();
+ aggregated_frame.delegated_frame_data.get();
const RenderPassList& aggregated_pass_list = frame_data->render_pass_list;
@@ -1711,14 +1675,12 @@ TEST_F(SurfaceAggregatorPartialSwapTest, IgnoreOutside) {
}
{
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
DelegatedFrameData* frame_data =
- aggregated_frame->delegated_frame_data.get();
+ aggregated_frame.delegated_frame_data.get();
const RenderPassList& aggregated_pass_list = frame_data->render_pass_list;
@@ -1738,14 +1700,12 @@ TEST_F(SurfaceAggregatorPartialSwapTest, IgnoreOutside) {
}
{
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
DelegatedFrameData* frame_data =
- aggregated_frame->delegated_frame_data.get();
+ aggregated_frame.delegated_frame_data.get();
const RenderPassList& aggregated_pass_list = frame_data->render_pass_list;
// There were no changes since last aggregation, so output should be empty
@@ -1781,14 +1741,12 @@ TEST_F(SurfaceAggregatorPartialSwapTest, IgnoreOutside) {
}
{
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
DelegatedFrameData* frame_data =
- aggregated_frame->delegated_frame_data.get();
+ aggregated_frame.delegated_frame_data.get();
const RenderPassList& aggregated_pass_list = frame_data->render_pass_list;
@@ -1833,14 +1791,12 @@ TEST_F(SurfaceAggregatorPartialSwapTest, IgnoreOutside) {
}
{
- std::unique_ptr<CompositorFrame> aggregated_frame =
- aggregator_.Aggregate(root_surface_id_);
+ CompositorFrame aggregated_frame = aggregator_.Aggregate(root_surface_id_);
- ASSERT_TRUE(aggregated_frame);
- ASSERT_TRUE(aggregated_frame->delegated_frame_data);
+ ASSERT_TRUE(aggregated_frame.delegated_frame_data);
DelegatedFrameData* frame_data =
- aggregated_frame->delegated_frame_data.get();
+ aggregated_frame.delegated_frame_data.get();
const RenderPassList& aggregated_pass_list = frame_data->render_pass_list;
@@ -1951,8 +1907,8 @@ void SubmitCompositorFrameWithResources(ResourceId* resource_ids,
nearest_neighbor, secure_output_only);
}
frame_data->render_pass_list.push_back(std::move(pass));
- std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
- frame->delegated_frame_data = std::move(frame_data);
+ CompositorFrame frame;
+ frame.delegated_frame_data = std::move(frame_data);
factory->SubmitCompositorFrame(surface_id, std::move(frame),
SurfaceFactory::DrawCallback());
}
@@ -1967,7 +1923,7 @@ TEST_F(SurfaceAggregatorWithResourcesTest, TakeResourcesOneSurface) {
SubmitCompositorFrameWithResources(ids, arraysize(ids), true, SurfaceId(),
&factory, surface_id);
- std::unique_ptr<CompositorFrame> frame = aggregator_->Aggregate(surface_id);
+ CompositorFrame frame = aggregator_->Aggregate(surface_id);
// Nothing should be available to be returned yet.
EXPECT_TRUE(client.returned_resources().empty());
@@ -2003,13 +1959,12 @@ TEST_F(SurfaceAggregatorWithResourcesTest, TakeInvalidResources) {
resource.is_software = false;
frame_data->resource_list.push_back(resource);
frame_data->render_pass_list.push_back(std::move(pass));
- std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
- frame->delegated_frame_data = std::move(frame_data);
+ CompositorFrame frame;
+ frame.delegated_frame_data = std::move(frame_data);
factory.SubmitCompositorFrame(surface_id, std::move(frame),
SurfaceFactory::DrawCallback());
- std::unique_ptr<CompositorFrame> returned_frame =
- aggregator_->Aggregate(surface_id);
+ CompositorFrame returned_frame = aggregator_->Aggregate(surface_id);
// Nothing should be available to be returned yet.
EXPECT_TRUE(client.returned_resources().empty());
@@ -2038,7 +1993,7 @@ TEST_F(SurfaceAggregatorWithResourcesTest, TwoSurfaces) {
SubmitCompositorFrameWithResources(ids2, arraysize(ids2), true, SurfaceId(),
&factory, surface2_id);
- std::unique_ptr<CompositorFrame> frame = aggregator_->Aggregate(surface1_id);
+ CompositorFrame frame = aggregator_->Aggregate(surface1_id);
SubmitCompositorFrameWithResources(NULL, 0, true, SurfaceId(), &factory,
surface1_id);
@@ -2087,10 +2042,10 @@ TEST_F(SurfaceAggregatorWithResourcesTest, InvalidChildSurface) {
middle_surface_id, &factory,
root_surface_id);
- std::unique_ptr<CompositorFrame> frame;
+ CompositorFrame frame;
frame = aggregator_->Aggregate(root_surface_id);
- RenderPassList* pass_list = &frame->delegated_frame_data->render_pass_list;
+ RenderPassList* pass_list = &frame.delegated_frame_data->render_pass_list;
ASSERT_EQ(1u, pass_list->size());
EXPECT_EQ(1u, pass_list->back()->shared_quad_state_list.size());
EXPECT_EQ(3u, pass_list->back()->quad_list.size());
@@ -2101,7 +2056,7 @@ TEST_F(SurfaceAggregatorWithResourcesTest, InvalidChildSurface) {
frame = aggregator_->Aggregate(root_surface_id);
- pass_list = &frame->delegated_frame_data->render_pass_list;
+ pass_list = &frame.delegated_frame_data->render_pass_list;
ASSERT_EQ(1u, pass_list->size());
EXPECT_EQ(3u, pass_list->back()->shared_quad_state_list.size());
EXPECT_EQ(9u, pass_list->back()->quad_list.size());
@@ -2124,10 +2079,10 @@ TEST_F(SurfaceAggregatorWithResourcesTest, SecureOutputTexture) {
SubmitCompositorFrameWithResources(ids, arraysize(ids), true, SurfaceId(),
&factory, surface1_id);
- std::unique_ptr<CompositorFrame> frame = aggregator_->Aggregate(surface1_id);
+ CompositorFrame frame = aggregator_->Aggregate(surface1_id);
RenderPass* render_pass =
- frame->delegated_frame_data->render_pass_list.back().get();
+ frame.delegated_frame_data->render_pass_list.back().get();
EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, render_pass->quad_list.back()->material);
@@ -2144,22 +2099,22 @@ TEST_F(SurfaceAggregatorWithResourcesTest, SecureOutputTexture) {
pass->copy_requests.push_back(CopyOutputRequest::CreateEmptyRequest());
frame_data->render_pass_list.push_back(std::move(pass));
- std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
- frame->delegated_frame_data = std::move(frame_data);
+ CompositorFrame frame;
+ frame.delegated_frame_data = std::move(frame_data);
factory.SubmitCompositorFrame(surface2_id, std::move(frame),
SurfaceFactory::DrawCallback());
}
frame = aggregator_->Aggregate(surface2_id);
- EXPECT_EQ(1u, frame->delegated_frame_data->render_pass_list.size());
- render_pass = frame->delegated_frame_data->render_pass_list.front().get();
+ EXPECT_EQ(1u, frame.delegated_frame_data->render_pass_list.size());
+ render_pass = frame.delegated_frame_data->render_pass_list.front().get();
// Parent has copy request, so texture should not be drawn.
EXPECT_EQ(DrawQuad::SOLID_COLOR, render_pass->quad_list.back()->material);
frame = aggregator_->Aggregate(surface2_id);
- EXPECT_EQ(1u, frame->delegated_frame_data->render_pass_list.size());
- render_pass = frame->delegated_frame_data->render_pass_list.front().get();
+ EXPECT_EQ(1u, frame.delegated_frame_data->render_pass_list.size());
+ render_pass = frame.delegated_frame_data->render_pass_list.front().get();
// Copy request has been executed earlier, so texture should be drawn.
EXPECT_EQ(DrawQuad::TEXTURE_CONTENT,
@@ -2168,7 +2123,7 @@ TEST_F(SurfaceAggregatorWithResourcesTest, SecureOutputTexture) {
aggregator_->set_output_is_secure(false);
frame = aggregator_->Aggregate(surface2_id);
- render_pass = frame->delegated_frame_data->render_pass_list.back().get();
+ render_pass = frame.delegated_frame_data->render_pass_list.back().get();
// Output is insecure, so texture should be drawn.
EXPECT_EQ(DrawQuad::SOLID_COLOR, render_pass->quad_list.back()->material);
« no previous file with comments | « cc/surfaces/surface_aggregator_perftest.cc ('k') | cc/surfaces/surface_display_output_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698