Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(398)

Unified Diff: content/common/gpu/client/gpu_memory_buffer_impl_linux.cc

Issue 634083002: gpu: Compositor management of GpuMemoryBuffer instances. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cc-pre-chromium-image-refactor
Patch Set: rebase Created 6 years, 2 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: content/common/gpu/client/gpu_memory_buffer_impl_linux.cc
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_linux.cc b/content/common/gpu/client/gpu_memory_buffer_impl_linux.cc
index 592920cdc01cc2c8d83f8968a3ab9b4e37a45c1d..6f81b0f733dc69a5046d0b38e3e9df83e7e9b9ab 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_linux.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_linux.cc
@@ -10,14 +10,13 @@ namespace content {
// static
void GpuMemoryBufferImpl::Create(const gfx::Size& size,
- unsigned internalformat,
- unsigned usage,
+ Format format,
+ Usage usage,
int client_id,
const CreationCallback& callback) {
if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported(
- size, internalformat, usage)) {
- GpuMemoryBufferImplSharedMemory::Create(
- size, internalformat, usage, callback);
+ size, format, usage)) {
+ GpuMemoryBufferImplSharedMemory::Create(size, format, callback);
return;
}
@@ -27,15 +26,15 @@ void GpuMemoryBufferImpl::Create(const gfx::Size& size,
// static
void GpuMemoryBufferImpl::AllocateForChildProcess(
const gfx::Size& size,
- unsigned internalformat,
- unsigned usage,
+ Format format,
+ Usage usage,
base::ProcessHandle child_process,
int child_client_id,
const AllocationCallback& callback) {
if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported(
- size, internalformat, usage)) {
+ size, format, usage)) {
GpuMemoryBufferImplSharedMemory::AllocateForChildProcess(
- size, internalformat, child_process, callback);
+ size, format, child_process, callback);
return;
}
@@ -53,12 +52,12 @@ void GpuMemoryBufferImpl::DeletedByChildProcess(
scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle(
const gfx::GpuMemoryBufferHandle& handle,
const gfx::Size& size,
- unsigned internalformat,
+ Format format,
const DestructionCallback& callback) {
switch (handle.type) {
case gfx::SHARED_MEMORY_BUFFER:
return GpuMemoryBufferImplSharedMemory::CreateFromHandle(
- handle, size, internalformat, callback);
+ handle, size, format, callback);
default:
return scoped_ptr<GpuMemoryBufferImpl>();
}

Powered by Google App Engine
This is Rietveld 408576698