cc/output/gl_renderer.cc - Issue 899183003: Fix double lock of texture resource in software renderer

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: cc/output/gl_renderer.cc

Issue 899183003: Fix double lock of texture resource in software renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: minor fixes Created 5 years, 10 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: cc/output/gl_renderer.cc

diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc

index 45d98b638859e2cadc76d4257740ee844ab2fcbc..15b2b4094446342de71d13be68421a0b93a3b340 100644

--- a/cc/output/gl_renderer.cc

+++ b/cc/output/gl_renderer.cc

@@ -2712,6 +2712,8 @@ bool GLRenderer::BindFramebufferToTexture(DrawingFrame* frame,

const gfx::Rect& target_rect) {

DCHECK(texture->id());

+ // Explicitly release lock, otherwise we can crash when try to lock

+ // same texture again.

current_framebuffer_lock_ = nullptr;

SetStencilEnabled(false);

« no previous file with comments | « no previous file | cc/output/software_renderer.cc » ('j') | cc/trees/layer_tree_host_pixeltest_readback.cc » ('J')