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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h" 5 #include "content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/trace_event/trace_event.h" 8 #include "base/trace_event/trace_event.h"
9 #include "content/common/gpu/gpu_memory_buffer_factory_surface_texture.h"
10 #include "gpu/ipc/common/android/surface_texture_manager.h" 9 #include "gpu/ipc/common/android/surface_texture_manager.h"
10 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
11 #include "ui/gfx/buffer_format_util.h" 11 #include "ui/gfx/buffer_format_util.h"
12 #include "ui/gl/android/surface_texture.h" 12 #include "ui/gl/android/surface_texture.h"
13 #include "ui/gl/gl_bindings.h" 13 #include "ui/gl/gl_bindings.h"
14 14
15 namespace content { 15 namespace content {
16 namespace { 16 namespace {
17 17
18 int WindowFormat(gfx::BufferFormat format) { 18 int WindowFormat(gfx::BufferFormat format) {
19 switch (format) { 19 switch (format) {
20 case gfx::BufferFormat::RGBA_8888: 20 case gfx::BufferFormat::RGBA_8888:
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 native_window, size.width(), size.height(), WindowFormat(format)); 79 native_window, size.width(), size.height(), WindowFormat(format));
80 80
81 return make_scoped_ptr(new GpuMemoryBufferImplSurfaceTexture( 81 return make_scoped_ptr(new GpuMemoryBufferImplSurfaceTexture(
82 handle.id, size, format, callback, native_window)); 82 handle.id, size, format, callback, native_window));
83 } 83 }
84 84
85 // static 85 // static
86 bool GpuMemoryBufferImplSurfaceTexture::IsConfigurationSupported( 86 bool GpuMemoryBufferImplSurfaceTexture::IsConfigurationSupported(
87 gfx::BufferFormat format, 87 gfx::BufferFormat format,
88 gfx::BufferUsage usage) { 88 gfx::BufferUsage usage) {
89 return GpuMemoryBufferFactorySurfaceTexture:: 89 return gpu::IsNativeGpuMemoryBufferConfigurationSupported(format, usage);
90 IsGpuMemoryBufferConfigurationSupported(format, usage);
91 } 90 }
92 91
93 // static 92 // static
94 base::Closure GpuMemoryBufferImplSurfaceTexture::AllocateForTesting( 93 base::Closure GpuMemoryBufferImplSurfaceTexture::AllocateForTesting(
95 const gfx::Size& size, 94 const gfx::Size& size,
96 gfx::BufferFormat format, 95 gfx::BufferFormat format,
97 gfx::BufferUsage usage, 96 gfx::BufferUsage usage,
98 gfx::GpuMemoryBufferHandle* handle) { 97 gfx::GpuMemoryBufferHandle* handle) {
99 scoped_refptr<gfx::SurfaceTexture> surface_texture = 98 scoped_refptr<gfx::SurfaceTexture> surface_texture =
100 gfx::SurfaceTexture::Create(0); 99 gfx::SurfaceTexture::Create(0);
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 141
143 gfx::GpuMemoryBufferHandle 142 gfx::GpuMemoryBufferHandle
144 GpuMemoryBufferImplSurfaceTexture::GetHandle() const { 143 GpuMemoryBufferImplSurfaceTexture::GetHandle() const {
145 gfx::GpuMemoryBufferHandle handle; 144 gfx::GpuMemoryBufferHandle handle;
146 handle.type = gfx::SURFACE_TEXTURE_BUFFER; 145 handle.type = gfx::SURFACE_TEXTURE_BUFFER;
147 handle.id = id_; 146 handle.id = id_;
148 return handle; 147 return handle;
149 } 148 }
150 149
151 } // namespace content 150 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698