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

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

Issue 1278333003: Fix crash caused by concurrent access to framebuffer_combo_complete_map_. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments; return unittesting of cache behaviour. Created 5 years, 4 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/gles2_cmd_decoder_unittest_base.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
index d78ec9853423cbbac6591cd27b862ff17b1b78b0..502d07634aed122a9ff92564c7a843f23442ab34 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
@@ -174,8 +174,6 @@ void GLES2DecoderTestBase::InitDecoderWithCommandLine(
// For easier substring/extension matching
DCHECK(normalized_init.extensions.empty() ||
*normalized_init.extensions.rbegin() == ' ');
- Framebuffer::ClearFramebufferCompleteComboMap();
-
gfx::SetGLGetProcAddressProc(gfx::MockGLInterface::GetGLProcAddress);
gfx::GLSurfaceTestSupport::InitializeOneOffWithMockBindings();
@@ -188,12 +186,9 @@ void GLES2DecoderTestBase::InitDecoderWithCommandLine(
if (command_line)
feature_info = new FeatureInfo(*command_line);
group_ = scoped_refptr<ContextGroup>(
- new ContextGroup(NULL,
- memory_tracker_,
- new ShaderTranslatorCache,
- feature_info.get(),
- new SubscriptionRefSet,
- new ValueStateMap,
+ new ContextGroup(NULL, memory_tracker_, new ShaderTranslatorCache,
+ new FramebufferCompletenessCache, feature_info.get(),
+ new SubscriptionRefSet, new ValueStateMap,
normalized_init.bind_generates_resource));
bool use_default_textures = normalized_init.bind_generates_resource;

Powered by Google App Engine
This is Rietveld 408576698