content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc - Issue 1831513003: Pull gpu service/client shared memory buffer code to GpuMemoryBufferSupport

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

Issue 1831513003: Pull gpu service/client shared memory buffer code to GpuMemoryBufferSupport (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed ifdef mixup Created 4 years, 9 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/gpu_memory_buffer_impl_ozone_native_pixmap.cc ('k') | content/common/gpu/gpu_memory_buffer_factory.h » ('j') | gpu/ipc/common/gpu_memory_buffer_support.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 5e48a9ea1154099f610b7e5960d231549be2cf85..1382451ed51fbd3ff1e475cbe2bbd01d8f3f9975 100644

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

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

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

#include "base/logging.h"

#include "base/trace_event/trace_event.h"

-#include "content/common/gpu/gpu_memory_buffer_factory_surface_texture.h"

#include "gpu/ipc/common/android/surface_texture_manager.h"

+#include "gpu/ipc/common/gpu_memory_buffer_support.h"

#include "ui/gfx/buffer_format_util.h"

#include "ui/gl/android/surface_texture.h"

#include "ui/gl/gl_bindings.h"

@@ -86,8 +86,7 @@ GpuMemoryBufferImplSurfaceTexture::CreateFromHandle(

bool GpuMemoryBufferImplSurfaceTexture::IsConfigurationSupported(

gfx::BufferFormat format,

gfx::BufferUsage usage) {

- return GpuMemoryBufferFactorySurfaceTexture::

- IsGpuMemoryBufferConfigurationSupported(format, usage);

+ return gpu::IsNativeGpuMemoryBufferConfigurationSupported(format, usage);

}

// static