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

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

Issue 2378583003: Ping watchdog thread during GpuChannel destruction (Closed)
Patch Set: Fix lifetime and use nullptr 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 ae5da9a9c2570663c2598fbc812ae68e1e2fdc76..1884200a53ac48986058a2f7cd5e7282bd625709 100644
--- a/gpu/command_buffer/service/framebuffer_manager_unittest.cc
+++ b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
@@ -41,14 +41,10 @@ class FramebufferManagerTest : public GpuServiceTest {
FramebufferManagerTest()
: manager_(1, 1, nullptr),
feature_info_(new FeatureInfo()) {
- texture_manager_.reset(new TextureManager(nullptr,
- feature_info_.get(),
- kMaxTextureSize,
- kMaxCubemapSize,
- kMaxRectangleTextureSize,
- kMax3DTextureSize,
- kMaxArrayTextureLayers,
- kUseDefaultTextures));
+ texture_manager_.reset(new TextureManager(
+ nullptr, feature_info_.get(), kMaxTextureSize, kMaxCubemapSize,
+ kMaxRectangleTextureSize, kMax3DTextureSize, kMaxArrayTextureLayers,
+ kUseDefaultTextures, nullptr));
renderbuffer_manager_.reset(new RenderbufferManager(nullptr,
kMaxRenderbufferSize,
kMaxSamples,
@@ -122,14 +118,10 @@ class FramebufferInfoTestBase : public GpuServiceTest {
kMaxColorAttachments,
new FramebufferCompletenessCache),
feature_info_(new FeatureInfo()) {
- texture_manager_.reset(new TextureManager(nullptr,
- feature_info_.get(),
- kMaxTextureSize,
- kMaxCubemapSize,
- kMaxRectangleTextureSize,
- kMax3DTextureSize,
- kMaxArrayTextureLayers,
- kUseDefaultTextures));
+ texture_manager_.reset(new TextureManager(
+ nullptr, feature_info_.get(), kMaxTextureSize, kMaxCubemapSize,
+ kMaxRectangleTextureSize, kMax3DTextureSize, kMaxArrayTextureLayers,
+ kUseDefaultTextures, nullptr));
renderbuffer_manager_.reset(new RenderbufferManager(nullptr,
kMaxRenderbufferSize,
kMaxSamples,

Powered by Google App Engine
This is Rietveld 408576698