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

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

Issue 2378583003: Ping watchdog thread during GpuChannel destruction (Closed)
Patch Set: revert to passing via destructor Created 4 years, 2 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/framebuffer_manager_unittest.cc
diff --git a/gpu/command_buffer/service/framebuffer_manager_unittest.cc b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
index 3970f600b3e1fae1ed690be9583d47354d596fe7..9a558fecabfacb13cbb323edabd0e701511690eb 100644
--- a/gpu/command_buffer/service/framebuffer_manager_unittest.cc
+++ b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
@@ -10,6 +10,7 @@
#include "gpu/command_buffer/service/framebuffer_manager.h"
#include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
#include "gpu/command_buffer/service/gpu_service_test.h"
+#include "gpu/command_buffer/service/progress_reporter_stub.h"
#include "gpu/command_buffer/service/renderbuffer_manager.h"
#include "gpu/command_buffer/service/test_helper.h"
#include "gpu/command_buffer/service/texture_manager.h"
@@ -56,7 +57,8 @@ class FramebufferManagerTest : public GpuServiceTest {
}
~FramebufferManagerTest() override {
manager_.Destroy(false);
- texture_manager_->Destroy(false);
+ ProgressReporterStub progress_reporter;
+ texture_manager_->Destroy(false, &progress_reporter);
renderbuffer_manager_->Destroy(false);
}
@@ -137,7 +139,8 @@ class FramebufferInfoTestBase : public GpuServiceTest {
}
~FramebufferInfoTestBase() override {
manager_.Destroy(false);
- texture_manager_->Destroy(false);
+ ProgressReporterStub progress_reporter;
+ texture_manager_->Destroy(false, &progress_reporter);
renderbuffer_manager_->Destroy(false);
}

Powered by Google App Engine
This is Rietveld 408576698