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

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.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 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/gles2_cmd_decoder_unittest_base.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 ::gl::MockGLInterface::SetGLInterface(gl_.get()); 186 ::gl::MockGLInterface::SetGLInterface(gl_.get());
187 187
188 SetupMockGLBehaviors(); 188 SetupMockGLBehaviors();
189 189
190 scoped_refptr<FeatureInfo> feature_info = new FeatureInfo; 190 scoped_refptr<FeatureInfo> feature_info = new FeatureInfo;
191 if (command_line) { 191 if (command_line) {
192 GpuDriverBugWorkarounds gpu_driver_bug_workaround(command_line); 192 GpuDriverBugWorkarounds gpu_driver_bug_workaround(command_line);
193 feature_info = new FeatureInfo(*command_line, gpu_driver_bug_workaround); 193 feature_info = new FeatureInfo(*command_line, gpu_driver_bug_workaround);
194 } 194 }
195 195
196 group_ = scoped_refptr<ContextGroup>( 196 group_ = scoped_refptr<ContextGroup>(new ContextGroup(
197 new ContextGroup(gpu_preferences_, NULL, memory_tracker_, 197 gpu_preferences_, NULL, memory_tracker_,
198 new ShaderTranslatorCache(gpu_preferences_), 198 new ShaderTranslatorCache(gpu_preferences_),
199 new FramebufferCompletenessCache, feature_info, 199 new FramebufferCompletenessCache, feature_info,
200 normalized_init.bind_generates_resource, nullptr)); 200 normalized_init.bind_generates_resource, nullptr, nullptr));
201 bool use_default_textures = normalized_init.bind_generates_resource; 201 bool use_default_textures = normalized_init.bind_generates_resource;
202 202
203 InSequence sequence; 203 InSequence sequence;
204 204
205 surface_ = new gl::GLSurfaceStub; 205 surface_ = new gl::GLSurfaceStub;
206 surface_->SetSize(gfx::Size(kBackBufferWidth, kBackBufferHeight)); 206 surface_->SetSize(gfx::Size(kBackBufferWidth, kBackBufferHeight));
207 207
208 // Context needs to be created before initializing ContextGroup, which will 208 // Context needs to be created before initializing ContextGroup, which will
209 // in turn initialize FeatureInfo, which needs a context to determine 209 // in turn initialize FeatureInfo, which needs a context to determine
210 // extension support. 210 // extension support.
(...skipping 1918 matching lines...) Expand 10 before | Expand all | Expand 10 after
2129 SetupDefaultProgram(); 2129 SetupDefaultProgram();
2130 } 2130 }
2131 2131
2132 // Include the auto-generated part of this file. We split this because it means 2132 // Include the auto-generated part of this file. We split this because it means
2133 // we can easily edit the non-auto generated parts right here in this file 2133 // we can easily edit the non-auto generated parts right here in this file
2134 // instead of having to edit some template or the code generator. 2134 // instead of having to edit some template or the code generator.
2135 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h" 2135 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_0_autogen.h"
2136 2136
2137 } // namespace gles2 2137 } // namespace gles2
2138 } // namespace gpu 2138 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698