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

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

Issue 263553009: content: Cleanup GpuMemoryBuffer allocation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac build fix Created 6 years, 7 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_io_surface.cc
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_io_surface.cc b/content/common/gpu/client/gpu_memory_buffer_impl_io_surface.cc
index d6d836cbbabbff5a14766dd2877ed3380b44b367..62732a1b4c6584f121b50448e78d2c78e63d587f 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_io_surface.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_io_surface.cc
@@ -11,7 +11,7 @@
namespace content {
GpuMemoryBufferImplIOSurface::GpuMemoryBufferImplIOSurface(
- gfx::Size size,
+ const gfx::Size& size,
unsigned internalformat)
: GpuMemoryBufferImpl(size, internalformat),
io_surface_support_(IOSurfaceSupport::Initialize()) {
@@ -41,6 +41,13 @@ bool GpuMemoryBufferImplIOSurface::IsUsageSupported(unsigned usage) {
}
// static
+bool GpuMemoryBufferImplIOSurface::IsConfigurationSupported(
+ unsigned internalformat,
+ unsigned usage) {
+ return IsFormatSupported(internalformat) && IsUsageSupported(usage);
+}
+
+// static
uint32 GpuMemoryBufferImplIOSurface::PixelFormat(unsigned internalformat) {
switch (internalformat) {
case GL_BGRA8_EXT:
@@ -51,8 +58,9 @@ uint32 GpuMemoryBufferImplIOSurface::PixelFormat(unsigned internalformat) {
}
}
-bool GpuMemoryBufferImplIOSurface::Initialize(
+bool GpuMemoryBufferImplIOSurface::InitializeFromHandle(
gfx::GpuMemoryBufferHandle handle) {
+ DCHECK(IsFormatSupported(internalformat_));
io_surface_.reset(io_surface_support_->IOSurfaceLookup(handle.io_surface_id));
if (!io_surface_) {
VLOG(1) << "IOSurface lookup failed";

Powered by Google App Engine
This is Rietveld 408576698