| Index: cc/output/output_surface_unittest.cc
|
| diff --git a/cc/output/output_surface_unittest.cc b/cc/output/output_surface_unittest.cc
|
| index a2ca1ddea408569d93236bdbcb88d69fcc37ebe3..64dfa9db92db8386e8559a0025a19f62f89d4f27 100644
|
| --- a/cc/output/output_surface_unittest.cc
|
| +++ b/cc/output/output_surface_unittest.cc
|
| @@ -430,42 +430,21 @@ TEST(OutputSurfaceTest, MemoryAllocation) {
|
| policy.bytes_limit_when_visible = 1234;
|
| policy.priority_cutoff_when_visible =
|
| gpu::MemoryAllocation::CUTOFF_ALLOW_REQUIRED_ONLY;
|
| - policy.bytes_limit_when_not_visible = 4567;
|
| - policy.priority_cutoff_when_not_visible =
|
| - gpu::MemoryAllocation::CUTOFF_ALLOW_NOTHING;
|
|
|
| - bool discard_backbuffer_when_not_visible = false;
|
| -
|
| - context_provider->SetMemoryAllocation(policy,
|
| - discard_backbuffer_when_not_visible);
|
| + context_provider->SetMemoryAllocation(policy);
|
| EXPECT_EQ(1234u, client.memory_policy().bytes_limit_when_visible);
|
| EXPECT_EQ(gpu::MemoryAllocation::CUTOFF_ALLOW_REQUIRED_ONLY,
|
| client.memory_policy().priority_cutoff_when_visible);
|
| - EXPECT_EQ(4567u, client.memory_policy().bytes_limit_when_not_visible);
|
| - EXPECT_EQ(gpu::MemoryAllocation::CUTOFF_ALLOW_NOTHING,
|
| - client.memory_policy().priority_cutoff_when_not_visible);
|
| - EXPECT_FALSE(client.discard_backbuffer_when_not_visible());
|
| -
|
| - discard_backbuffer_when_not_visible = true;
|
| - context_provider->SetMemoryAllocation(policy,
|
| - discard_backbuffer_when_not_visible);
|
| - EXPECT_TRUE(client.discard_backbuffer_when_not_visible());
|
|
|
| policy.priority_cutoff_when_visible =
|
| gpu::MemoryAllocation::CUTOFF_ALLOW_EVERYTHING;
|
| - policy.priority_cutoff_when_not_visible =
|
| - gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE;
|
| - context_provider->SetMemoryAllocation(policy,
|
| - discard_backbuffer_when_not_visible);
|
| + context_provider->SetMemoryAllocation(policy);
|
| EXPECT_EQ(gpu::MemoryAllocation::CUTOFF_ALLOW_EVERYTHING,
|
| client.memory_policy().priority_cutoff_when_visible);
|
| - EXPECT_EQ(gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE,
|
| - client.memory_policy().priority_cutoff_when_not_visible);
|
|
|
| // 0 bytes limit should be ignored.
|
| policy.bytes_limit_when_visible = 0;
|
| - context_provider->SetMemoryAllocation(policy,
|
| - discard_backbuffer_when_not_visible);
|
| + context_provider->SetMemoryAllocation(policy);
|
| EXPECT_EQ(1234u, client.memory_policy().bytes_limit_when_visible);
|
| }
|
|
|
|
|