content/common/gpu/gpu_channel.cc - Issue 1403283007: Re-land: ui: Add custom stride support to GLImageMemory.

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: content/common/gpu/gpu_channel.cc

Issue 1403283007: Re-land: ui: Add custom stride support to GLImageMemory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more missing static_casts Created 5 years, 1 month 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 | « content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.cc ('k') | gpu/command_buffer/service/in_process_command_buffer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/gpu_channel.cc

diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc

index 746bc11519a879f99fd18bbf6964e7a639884d98..f8559b9ff9e716dfbb419155b549a7662f076dec 100644

--- a/content/common/gpu/gpu_channel.cc

+++ b/content/common/gpu/gpu_channel.cc

@@ -17,6 +17,7 @@

#include "base/bind.h"

#include "base/command_line.h"

#include "base/location.h"

+#include "base/numerics/safe_conversions.h"

#include "base/single_thread_task_runner.h"

#include "base/stl_util.h"

#include "base/strings/string_util.h"

@@ -1040,10 +1041,14 @@ scoped_refptr<gl::GLImage> GpuChannel::CreateImageForGpuMemoryBuffer(

uint32 internalformat) {

switch (handle.type) {

case gfx::SHARED_MEMORY_BUFFER: {

+ if (!base::IsValueInRangeForNumericType<size_t>(handle.stride))

+ return nullptr;

scoped_refptr<gl::GLImageSharedMemory> image(

new gl::GLImageSharedMemory(size, internalformat));

- if (!image->Initialize(handle.handle, handle.id, format, handle.offset))

+ if (!image->Initialize(handle.handle, handle.id, format, handle.offset,

+ handle.stride)) {

return nullptr;

+ }

return image;

}