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

Unified Diff: cc/surfaces/display_unittest.cc

Issue 2485473003: Remove SurfaceFactory::Create and SurfaceFactory::Destroy (Closed)
Patch Set: up Created 4 years, 1 month 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/direct_compositor_frame_sink.cc ('k') | cc/surfaces/surface_aggregator_perftest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/display_unittest.cc
diff --git a/cc/surfaces/display_unittest.cc b/cc/surfaces/display_unittest.cc
index 7b576ac21a8d41c54b66246b8d985fce43e54e4b..4534edb9796002a3ec1b0f28b427f3504453ddad 100644
--- a/cc/surfaces/display_unittest.cc
+++ b/cc/surfaces/display_unittest.cc
@@ -106,6 +106,7 @@ class DisplayTest : public testing::Test {
~DisplayTest() override {
manager_.InvalidateFrameSinkId(kArbitraryFrameSinkId);
+ factory_.EvictSurface();
}
void SetUpDisplay(const RendererSettings& settings,
@@ -196,8 +197,6 @@ TEST_F(DisplayTest, DisplayDamaged) {
EXPECT_TRUE(scheduler_->display_resized_);
EXPECT_FALSE(scheduler_->has_new_root_surface);
- factory_.Create(local_frame_id);
-
// First draw from surface should have full damage.
RenderPassList pass_list;
std::unique_ptr<RenderPass> pass = RenderPass::Create();
@@ -414,8 +413,6 @@ TEST_F(DisplayTest, DisplayDamaged) {
software_output_device_->damage_rect());
EXPECT_EQ(0u, output_surface_->last_sent_frame()->latency_info.size());
}
-
- factory_.Destroy(local_frame_id);
}
class MockedContext : public TestWebGraphicsContext3D {
@@ -442,7 +439,6 @@ TEST_F(DisplayTest, Finish) {
display_->SetLocalFrameId(local_frame_id, 1.f);
display_->Resize(gfx::Size(100, 100));
- factory_.Create(local_frame_id);
{
RenderPassList pass_list;
@@ -488,8 +484,6 @@ TEST_F(DisplayTest, Finish) {
EXPECT_CALL(*context_ptr, shallowFinishCHROMIUM());
display_->Resize(gfx::Size(250, 250));
testing::Mock::VerifyAndClearExpectations(context_ptr);
-
- factory_.Destroy(local_frame_id);
}
class CountLossDisplayClient : public StubDisplayClient {
« no previous file with comments | « cc/surfaces/direct_compositor_frame_sink.cc ('k') | cc/surfaces/surface_aggregator_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698