ui/gl/gl_gl_api_implementation.cc - Issue 15841002: gpu: Fix corrupted state due to virtual MakeCurrent race.

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: ui/gl/gl_gl_api_implementation.cc

Issue 15841002: gpu: Fix corrupted state due to virtual MakeCurrent race. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Reland patch. Created 7 years, 7 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: ui/gl/gl_gl_api_implementation.cc

diff --git a/ui/gl/gl_gl_api_implementation.cc b/ui/gl/gl_gl_api_implementation.cc

index 1002dbd278842f0e51a8868f58b1bea16bf5f5fe..a8f671e911f1da1c4ad14223da1840e4286dc948 100644

--- a/ui/gl/gl_gl_api_implementation.cc

+++ b/ui/gl/gl_gl_api_implementation.cc

@@ -285,7 +285,8 @@ bool VirtualGLApi::MakeCurrent(GLContext* virtual_context, GLSurface* surface) {

// needed for individual GL calls.

GLApi* temp = GetCurrentGLApi();

SetGLToRealGLApi();

- virtual_context->GetGLStateRestorer()->RestoreState();

+ if (virtual_context->GetGLStateRestorer()->IsInitialized())

+ virtual_context->GetGLStateRestorer()->RestoreState();

SetGLApi(temp);

}

SetGLApi(this);

« no previous file with comments | « gpu/command_buffer/service/gl_state_restorer_impl.cc ('k') | ui/gl/gl_state_restorer.h » ('j') | no next file with comments »