gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc - Issue 1278333003: Fix crash caused by concurrent access to framebuffer_combo_complete_map_.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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. 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

« no previous file with comments | « gpu/command_buffer/service/framebuffer_manager_unittest.cc ('k') | gpu/command_buffer/service/in_process_command_buffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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;