gpu/command_buffer/service/texture_manager_unittest.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/texture_manager_unittest.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

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

Index: gpu/command_buffer/service/texture_manager_unittest.cc

diff --git a/gpu/command_buffer/service/texture_manager_unittest.cc b/gpu/command_buffer/service/texture_manager_unittest.cc

index cfb3200aab283825921d700bbfc8c99cf42f04b0..04e48f511e74623c3cf9e0c8b6aa67d8310aa646 100644

--- a/gpu/command_buffer/service/texture_manager_unittest.cc

+++ b/gpu/command_buffer/service/texture_manager_unittest.cc

@@ -1853,10 +1853,10 @@ TEST_F(SharedTextureTest, TextureSafetyAccounting) {

TEST_F(SharedTextureTest, FBOCompletenessCheck) {

const GLenum kCompleteValue = GL_FRAMEBUFFER_COMPLETE;

FramebufferManager framebuffer_manager1(

- 1, 1, ContextGroup::CONTEXT_TYPE_UNDEFINED);

+ 1, 1, ContextGroup::CONTEXT_TYPE_UNDEFINED, NULL);

texture_manager1_->set_framebuffer_manager(&framebuffer_manager1);

FramebufferManager framebuffer_manager2(

- 1, 1, ContextGroup::CONTEXT_TYPE_UNDEFINED);

+ 1, 1, ContextGroup::CONTEXT_TYPE_UNDEFINED, NULL);

texture_manager2_->set_framebuffer_manager(&framebuffer_manager2);

scoped_refptr<TextureRef> ref1 = texture_manager1_->CreateTexture(10, 10);