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

Unified Diff: gpu/command_buffer/service/program_manager_unittest.cc

Issue 2378583003: Ping watchdog thread during GpuChannel destruction (Closed)
Patch Set: remove throttling Created 4 years, 3 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
Index: gpu/command_buffer/service/program_manager_unittest.cc
diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc
index 196c979c4d67f398d599e2c25cbfa2884f8d1ca5..8f03f2569db50551dc1d4628b7f9f04de10e0997 100644
--- a/gpu/command_buffer/service/program_manager_unittest.cc
+++ b/gpu/command_buffer/service/program_manager_unittest.cc
@@ -83,7 +83,7 @@ class ProgramManagerTestBase : public GpuServiceTest {
SetUpBase("2.0", "GL_EXT_framebuffer_object");
}
void TearDown() override {
- manager_->Destroy(false);
+ manager_->Destroy(false, nullptr);
manager_.reset();
feature_info_ = nullptr;
GpuServiceTest::TearDown();
@@ -124,7 +124,7 @@ TEST_F(ProgramManagerTest, Destroy) {
EXPECT_CALL(*gl_, DeleteProgram(kService1Id))
.Times(1)
.RetiresOnSaturation();
- manager_->Destroy(true);
+ manager_->Destroy(true, nullptr);
// Check the resources were released.
program1 = manager_->GetProgram(kClient1Id);
ASSERT_TRUE(program1 == NULL);
@@ -444,7 +444,7 @@ class ProgramManagerWithShaderTest : public ProgramManagerTestBase {
}
void TearDown() override {
- shader_manager_.Destroy(false);
+ shader_manager_.Destroy(false, nullptr);
ProgramManagerTestBase::TearDown();
}
@@ -2099,7 +2099,7 @@ class ProgramManagerWithCacheTest : public ProgramManagerTestBase {
}
void TearDown() override {
- shader_manager_.Destroy(false);
+ shader_manager_.Destroy(false, nullptr);
ProgramManagerTestBase::TearDown();
}

Powered by Google App Engine
This is Rietveld 408576698