content/common/gpu/client/gpu_memory_buffer_impl.cc - Issue 968283002: content: Remove use of GLImage from GpuMemoryBufferImpl.

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/client/gpu_memory_buffer_impl.cc

Issue 968283002: content: Remove use of GLImage from GpuMemoryBufferImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add size check to gmb code 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

« no previous file with comments | « content/common/gpu/client/command_buffer_proxy_impl.cc ('k') | content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/client/gpu_memory_buffer_impl.cc

diff --git a/content/common/gpu/client/gpu_memory_buffer_impl.cc b/content/common/gpu/client/gpu_memory_buffer_impl.cc

index e2a48beeef2854d870e46c040be833dcc15b1b57..0c0426f6794c394c3c05ad6abebdf1ace85f611b 100644

--- a/content/common/gpu/client/gpu_memory_buffer_impl.cc

+++ b/content/common/gpu/client/gpu_memory_buffer_impl.cc

@@ -8,7 +8,6 @@

#include "base/numerics/safe_math.h"

#include "content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h"

#include "ui/gl/gl_bindings.h"

-#include "ui/gl/gl_image_memory.h"

#if defined(OS_MACOSX)

#include "content/common/gpu/client/gpu_memory_buffer_impl_io_surface.h"

@@ -34,7 +33,6 @@ GpuMemoryBufferImpl::GpuMemoryBufferImpl(gfx::GpuMemoryBufferId id,

callback_(callback),

mapped_(false),

destruction_sync_point_(0) {

- DCHECK(gfx::GLImageMemory::ValidSize(size, format));

}

GpuMemoryBufferImpl::~GpuMemoryBufferImpl() {