| Index: content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc
|
| diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc b/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc
|
| deleted file mode 100644
|
| index 1db70332c41efd09153ed5ed73dba044300d7508..0000000000000000000000000000000000000000
|
| --- a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc
|
| +++ /dev/null
|
| @@ -1,111 +0,0 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.h"
|
| -
|
| -#include <utility>
|
| -
|
| -#include "gpu/ipc/common/gpu_memory_buffer_support.h"
|
| -#include "ui/gfx/buffer_format_util.h"
|
| -#include "ui/ozone/public/client_native_pixmap_factory.h"
|
| -#include "ui/ozone/public/native_pixmap.h"
|
| -#include "ui/ozone/public/ozone_platform.h"
|
| -#include "ui/ozone/public/surface_factory_ozone.h"
|
| -
|
| -namespace content {
|
| -namespace {
|
| -
|
| -void FreeNativePixmapForTesting(scoped_refptr<ui::NativePixmap> native_pixmap) {
|
| - // Nothing to do here. |native_pixmap| will be freed when this function
|
| - // returns and reference count drops to 0.
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| -GpuMemoryBufferImplOzoneNativePixmap::GpuMemoryBufferImplOzoneNativePixmap(
|
| - gfx::GpuMemoryBufferId id,
|
| - const gfx::Size& size,
|
| - gfx::BufferFormat format,
|
| - const DestructionCallback& callback,
|
| - scoped_ptr<ui::ClientNativePixmap> pixmap)
|
| - : GpuMemoryBufferImpl(id, size, format, callback),
|
| - pixmap_(std::move(pixmap)) {}
|
| -
|
| -GpuMemoryBufferImplOzoneNativePixmap::~GpuMemoryBufferImplOzoneNativePixmap() {}
|
| -
|
| -// static
|
| -scoped_ptr<GpuMemoryBufferImplOzoneNativePixmap>
|
| -GpuMemoryBufferImplOzoneNativePixmap::CreateFromHandle(
|
| - const gfx::GpuMemoryBufferHandle& handle,
|
| - const gfx::Size& size,
|
| - gfx::BufferFormat format,
|
| - gfx::BufferUsage usage,
|
| - const DestructionCallback& callback) {
|
| - scoped_ptr<ui::ClientNativePixmap> native_pixmap =
|
| - ui::ClientNativePixmapFactory::GetInstance()->ImportFromHandle(
|
| - handle.native_pixmap_handle, size, usage);
|
| - DCHECK(native_pixmap);
|
| - return make_scoped_ptr(new GpuMemoryBufferImplOzoneNativePixmap(
|
| - handle.id, size, format, callback, std::move(native_pixmap)));
|
| -}
|
| -
|
| -// static
|
| -bool GpuMemoryBufferImplOzoneNativePixmap::IsConfigurationSupported(
|
| - gfx::BufferFormat format,
|
| - gfx::BufferUsage usage) {
|
| - return gpu::IsNativeGpuMemoryBufferConfigurationSupported(format, usage);
|
| -}
|
| -
|
| -// static
|
| -base::Closure GpuMemoryBufferImplOzoneNativePixmap::AllocateForTesting(
|
| - const gfx::Size& size,
|
| - gfx::BufferFormat format,
|
| - gfx::BufferUsage usage,
|
| - gfx::GpuMemoryBufferHandle* handle) {
|
| - DCHECK(IsConfigurationSupported(format, usage));
|
| - scoped_refptr<ui::NativePixmap> pixmap =
|
| - ui::OzonePlatform::GetInstance()
|
| - ->GetSurfaceFactoryOzone()
|
| - ->CreateNativePixmap(gfx::kNullPluginWindow, size, format, usage);
|
| - handle->type = gfx::OZONE_NATIVE_PIXMAP;
|
| - handle->native_pixmap_handle = pixmap->ExportHandle();
|
| - return base::Bind(&FreeNativePixmapForTesting, pixmap);
|
| -}
|
| -
|
| -bool GpuMemoryBufferImplOzoneNativePixmap::Map() {
|
| - DCHECK(!mapped_);
|
| - if (!pixmap_->Map())
|
| - return false;
|
| - mapped_ = true;
|
| - return mapped_;
|
| -}
|
| -
|
| -void* GpuMemoryBufferImplOzoneNativePixmap::memory(size_t plane) {
|
| - DCHECK(mapped_);
|
| - DCHECK_LT(plane, gfx::NumberOfPlanesForBufferFormat(format_));
|
| - return pixmap_->Map();
|
| -}
|
| -
|
| -void GpuMemoryBufferImplOzoneNativePixmap::Unmap() {
|
| - DCHECK(mapped_);
|
| - pixmap_->Unmap();
|
| - mapped_ = false;
|
| -}
|
| -
|
| -int GpuMemoryBufferImplOzoneNativePixmap::stride(size_t plane) const {
|
| - DCHECK_LT(plane, gfx::NumberOfPlanesForBufferFormat(format_));
|
| - int stride;
|
| - pixmap_->GetStride(&stride);
|
| - return stride;
|
| -}
|
| -
|
| -gfx::GpuMemoryBufferHandle GpuMemoryBufferImplOzoneNativePixmap::GetHandle()
|
| - const {
|
| - gfx::GpuMemoryBufferHandle handle;
|
| - handle.type = gfx::OZONE_NATIVE_PIXMAP;
|
| - handle.id = id_;
|
| - return handle;
|
| -}
|
| -
|
| -} // namespace content
|
|
|