gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc - Issue 1272153004: Add glCompressedCopySubTextureCHROMIUM

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

Issue 1272153004: Add glCompressedCopySubTextureCHROMIUM (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: xoffset and yoffset should be validated against destination texture 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:

Index: gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc

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

index 846ac0d6a12b9be9218a3d26a2a866fc87c67292..1ed0af75e3a7022dad84c2320b1a1c17d8996a7e 100644

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

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

@@ -471,8 +471,10 @@ void CopyTextureCHROMIUMResourceManager::DoCopyTextureInternal(

DCHECK(source_target == GL_TEXTURE_2D ||

source_target == GL_TEXTURE_RECTANGLE_ARB ||

source_target == GL_TEXTURE_EXTERNAL_OES);

- DCHECK(xoffset >= 0 && xoffset + source_width <= dest_width);

- DCHECK(yoffset >= 0 && yoffset + source_height <= dest_height);

+ DCHECK_GE(xoffset, 0);

+ DCHECK_LE(xoffset + width, dest_width);

+ DCHECK_GE(yoffset, 0);

+ DCHECK_LE(yoffset + height, dest_height);

if (!initialized_) {

DLOG(ERROR) << "CopyTextureCHROMIUM: Uninitialized manager.";

return;