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

Side by Side Diff: gpu/command_buffer/service/shader_manager_unittest.cc

Issue 2378583003: Ping watchdog thread during GpuChannel destruction (Closed)
Patch Set: feedback 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/command_buffer/service/shader_manager.h" 5 #include "gpu/command_buffer/service/shader_manager.h"
6 6
7 #include "gpu/command_buffer/service/gpu_service_test.h" 7 #include "gpu/command_buffer/service/gpu_service_test.h"
8 #include "gpu/command_buffer/service/mocks.h" 8 #include "gpu/command_buffer/service/mocks.h"
9 #include "gpu/command_buffer/service/progress_reporter_stub.h"
9 #include "gpu/command_buffer/service/test_helper.h" 10 #include "gpu/command_buffer/service/test_helper.h"
10 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
11 #include "ui/gl/gl_mock.h" 12 #include "ui/gl/gl_mock.h"
12 13
13 using ::testing::Return; 14 using ::testing::Return;
14 using ::testing::ReturnRef; 15 using ::testing::ReturnRef;
15 16
16 namespace gpu { 17 namespace gpu {
17 namespace gles2 { 18 namespace gles2 {
18 19
19 class ShaderManagerTest : public GpuServiceTest { 20 class ShaderManagerTest : public GpuServiceTest {
20 public: 21 public:
21 ShaderManagerTest() { 22 ShaderManagerTest() : manager_(&progress_reporter_) {}
22 }
23 23
24 ~ShaderManagerTest() override { manager_.Destroy(false); } 24 ~ShaderManagerTest() override { manager_.Destroy(false); }
25 25
26 protected: 26 protected:
27 ShaderManager manager_; 27 ShaderManager manager_;
28 ProgressReporterStub progress_reporter_;
28 }; 29 };
29 30
30 TEST_F(ShaderManagerTest, Basic) { 31 TEST_F(ShaderManagerTest, Basic) {
31 const GLuint kClient1Id = 1; 32 const GLuint kClient1Id = 1;
32 const GLuint kService1Id = 11; 33 const GLuint kService1Id = 11;
33 const GLenum kShader1Type = GL_VERTEX_SHADER; 34 const GLenum kShader1Type = GL_VERTEX_SHADER;
34 const GLuint kClient2Id = 2; 35 const GLuint kClient2Id = 2;
35 // Check we can create shader. 36 // Check we can create shader.
36 Shader* info0 = manager_.CreateShader( 37 Shader* info0 = manager_.CreateShader(
37 kClient1Id, kService1Id, kShader1Type); 38 kClient1Id, kService1Id, kShader1Type);
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 EXPECT_CALL(*gl_, DeleteShader(kService1Id)) 314 EXPECT_CALL(*gl_, DeleteShader(kService1Id))
314 .Times(1) 315 .Times(1)
315 .RetiresOnSaturation(); 316 .RetiresOnSaturation();
316 manager_.Delete(shader1); // this should delete the shader. 317 manager_.Delete(shader1); // this should delete the shader.
317 shader2 = manager_.GetShader(kClient1Id); 318 shader2 = manager_.GetShader(kClient1Id);
318 EXPECT_TRUE(shader2 == NULL); 319 EXPECT_TRUE(shader2 == NULL);
319 } 320 }
320 321
321 } // namespace gles2 322 } // namespace gles2
322 } // namespace gpu 323 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698