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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/command_buffer/service/texture_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
« no previous file with comments | « gpu/command_buffer/service/texture_manager.cc ('k') | gpu/command_buffer/tests/fuzzer_main.cc » ('j') | gpu/ipc/service/gpu_command_buffer_stub.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/texture_manager_unittest.cc
diff --git a/gpu/command_buffer/service/texture_manager_unittest.cc b/gpu/command_buffer/service/texture_manager_unittest.cc
index 0236f718615a083ca4da6704b41abb855a004025..f36b6f69cd012afb22c571c4b8f2411bb0b4530c 100644
--- a/gpu/command_buffer/service/texture_manager_unittest.cc
+++ b/gpu/command_buffer/service/texture_manager_unittest.cc
@@ -21,6 +21,7 @@
#include "gpu/command_buffer/service/mailbox_manager.h"
#include "gpu/command_buffer/service/memory_tracking.h"
#include "gpu/command_buffer/service/mocks.h"
+#include "gpu/command_buffer/service/progress_reporter_stub.h"
#include "gpu/command_buffer/service/test_helper.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gl/gl_image_stub.h"
@@ -97,7 +98,8 @@ class TextureManagerTest : public GpuServiceTest {
}
void TearDown() override {
- manager_->Destroy(false);
+ ProgressReporterStub progress_reporter;
+ manager_->Destroy(false, &progress_reporter);
manager_.reset();
GpuServiceTest::TearDown();
}
@@ -263,7 +265,8 @@ TEST_F(TextureManagerTest, UseDefaultTexturesTrue) {
// TODO(vmiura): Test GL_TEXTURE_EXTERNAL_OES & GL_TEXTURE_RECTANGLE_ARB.
- manager.Destroy(false);
+ ProgressReporterStub progress_reporter;
+ manager.Destroy(false, &progress_reporter);
}
TEST_F(TextureManagerTest, UseDefaultTexturesFalse) {
@@ -285,7 +288,8 @@ TEST_F(TextureManagerTest, UseDefaultTexturesFalse) {
// TODO(vmiura): Test GL_TEXTURE_EXTERNAL_OES & GL_TEXTURE_RECTANGLE_ARB.
- manager.Destroy(false);
+ ProgressReporterStub progress_reporter;
+ manager.Destroy(false, &progress_reporter);
}
TEST_F(TextureManagerTest, UseDefaultTexturesTrueES3) {
@@ -306,7 +310,8 @@ TEST_F(TextureManagerTest, UseDefaultTexturesTrueES3) {
EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_3D) != NULL);
EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_2D_ARRAY) != NULL);
- manager.Destroy(false);
+ ProgressReporterStub progress_reporter;
+ manager.Destroy(false, &progress_reporter);
}
TEST_F(TextureManagerTest, UseDefaultTexturesFalseES3) {
@@ -327,7 +332,8 @@ TEST_F(TextureManagerTest, UseDefaultTexturesFalseES3) {
EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_3D) == NULL);
EXPECT_TRUE(manager.GetDefaultTextureInfo(GL_TEXTURE_2D_ARRAY) == NULL);
- manager.Destroy(false);
+ ProgressReporterStub progress_reporter;
+ manager.Destroy(false, &progress_reporter);
}
TEST_F(TextureManagerTest, TextureUsageExt) {
@@ -355,7 +361,8 @@ TEST_F(TextureManagerTest, TextureUsageExt) {
GL_TEXTURE_USAGE_ANGLE, GL_FRAMEBUFFER_ATTACHMENT_ANGLE, GL_NO_ERROR);
EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_ATTACHMENT_ANGLE),
texture_ref->texture()->usage());
- manager.Destroy(false);
+ ProgressReporterStub progress_reporter;
+ manager.Destroy(false, &progress_reporter);
}
TEST_F(TextureManagerTest, Destroy) {
@@ -382,7 +389,8 @@ TEST_F(TextureManagerTest, Destroy) {
.RetiresOnSaturation();
TestHelper::SetupTextureManagerDestructionExpectations(
gl_.get(), false, false, "", kUseDefaultTextures);
- manager.Destroy(true);
+ ProgressReporterStub progress_reporter;
+ manager.Destroy(true, &progress_reporter);
// Check that resources got freed.
texture = manager.GetTexture(kClient1Id);
ASSERT_TRUE(texture == NULL);
@@ -538,7 +546,8 @@ TEST_F(TextureManagerTest, ValidForTargetNPOT) {
EXPECT_TRUE(manager.ValidForTarget(GL_TEXTURE_2D, 1, 5, 2, 1));
// Check NPOT height on level 1
EXPECT_TRUE(manager.ValidForTarget(GL_TEXTURE_2D, 1, 2, 5, 1));
- manager.Destroy(false);
+ ProgressReporterStub progress_reporter;
+ manager.Destroy(false, &progress_reporter);
}
TEST_F(TextureManagerTest, AlphaLuminanceCompatibilityProfile) {
@@ -740,7 +749,8 @@ class TextureTestBase : public GpuServiceTest {
}
texture_ref_ = NULL;
}
- manager_->Destroy(false);
+ ProgressReporterStub progress_reporter;
+ manager_->Destroy(false, &progress_reporter);
manager_.reset();
GpuServiceTest::TearDown();
}
@@ -1043,7 +1053,8 @@ TEST_F(TextureTest, NPOT2DNPOTOK) {
manager.MarkMipmapsGenerated(texture_ref);
EXPECT_TRUE(TextureTestHelper::IsTextureComplete(texture));
EXPECT_TRUE(manager.CanRender(texture_ref));
- manager.Destroy(false);
+ ProgressReporterStub progress_reporter;
+ manager.Destroy(false, &progress_reporter);
}
TEST_F(TextureTest, POTCubeMap) {
@@ -1345,7 +1356,8 @@ TEST_F(TextureTest, FloatNotLinear) {
gl_.get(), error_state_.get(), &manager, texture_ref,
GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST, GL_NO_ERROR);
EXPECT_TRUE(manager.CanRender(texture_ref));
- manager.Destroy(false);
+ ProgressReporterStub progress_reporter;
+ manager.Destroy(false, &progress_reporter);
}
TEST_F(TextureTest, FloatLinear) {
@@ -1370,7 +1382,8 @@ TEST_F(TextureTest, FloatLinear) {
manager.SetLevelInfo(texture_ref, GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 1, 0,
GL_RGBA, GL_FLOAT, gfx::Rect(1, 1));
EXPECT_TRUE(manager.CanRender(texture_ref));
- manager.Destroy(false);
+ ProgressReporterStub progress_reporter;
+ manager.Destroy(false, &progress_reporter);
}
TEST_F(TextureTest, HalfFloatNotLinear) {
@@ -1403,7 +1416,8 @@ TEST_F(TextureTest, HalfFloatNotLinear) {
gl_.get(), error_state_.get(), &manager, texture_ref,
GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST, GL_NO_ERROR);
EXPECT_TRUE(manager.CanRender(texture_ref));
- manager.Destroy(false);
+ ProgressReporterStub progress_reporter;
+ manager.Destroy(false, &progress_reporter);
}
TEST_F(TextureTest, HalfFloatLinear) {
@@ -1428,7 +1442,8 @@ TEST_F(TextureTest, HalfFloatLinear) {
manager.SetLevelInfo(texture_ref, GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 1, 0,
GL_RGBA, GL_HALF_FLOAT_OES, gfx::Rect(1, 1));
EXPECT_TRUE(manager.CanRender(texture_ref));
- manager.Destroy(false);
+ ProgressReporterStub progress_reporter;
+ manager.Destroy(false, &progress_reporter);
}
TEST_F(TextureTest, EGLImageExternal) {
@@ -1451,7 +1466,8 @@ TEST_F(TextureTest, EGLImageExternal) {
Texture* texture = texture_ref->texture();
EXPECT_EQ(static_cast<GLenum>(GL_TEXTURE_EXTERNAL_OES), texture->target());
EXPECT_FALSE(manager.CanGenerateMipmaps(texture_ref));
- manager.Destroy(false);
+ ProgressReporterStub progress_reporter;
+ manager.Destroy(false, &progress_reporter);
}
TEST_F(TextureTest, DepthTexture) {
@@ -1474,7 +1490,8 @@ TEST_F(TextureTest, DepthTexture) {
manager.SetLevelInfo(texture_ref, GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, 4, 4,
1, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, gfx::Rect());
EXPECT_FALSE(manager.CanGenerateMipmaps(texture_ref));
- manager.Destroy(false);
+ ProgressReporterStub progress_reporter;
+ manager.Destroy(false, &progress_reporter);
}
TEST_F(TextureTest, SafeUnsafe) {
@@ -2264,9 +2281,10 @@ class SharedTextureTest : public GpuServiceTest {
}
void TearDown() override {
- texture_manager2_->Destroy(false);
+ ProgressReporterStub progress_reporter;
+ texture_manager2_->Destroy(false, &progress_reporter);
texture_manager2_.reset();
- texture_manager1_->Destroy(false);
+ texture_manager1_->Destroy(false, &progress_reporter);
texture_manager1_.reset();
GpuServiceTest::TearDown();
}
« no previous file with comments | « gpu/command_buffer/service/texture_manager.cc ('k') | gpu/command_buffer/tests/fuzzer_main.cc » ('j') | gpu/ipc/service/gpu_command_buffer_stub.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698