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

Unified Diff: content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h

Issue 1134993003: ozone: Implement zero/one-copy texture for Ozone GBM. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase to new crrev.com/1128113011 Created 5 years, 6 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_ozone_native_buffer.h
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h b/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h
index 882e1e04235a443c01bfe69991a63ecec64fafe8..42bb7310c08297c510ca18c1a1bba9421b0ef20c 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h
@@ -6,6 +6,7 @@
#define CONTENT_COMMON_GPU_CLIENT_GPU_MEMORY_BUFFER_IMPL_OZONE_NATIVE_BUFFER_H_
#include "content/common/gpu/client/gpu_memory_buffer_impl.h"
+#include "ui/ozone/public/native_pixmap_manager.h"
namespace content {
@@ -13,12 +14,15 @@ namespace content {
class GpuMemoryBufferImplOzoneNativeBuffer : public GpuMemoryBufferImpl {
reveman 2015/06/25 14:07:51 There's now both OzoneNativeBuffer and NativePixma
dshwang 2015/06/25 14:52:13 I think GpuMemoryBufferFactoryOzoneNativeBuffer an
public:
static scoped_ptr<GpuMemoryBufferImpl> CreateFromHandle(
+ ui::NativePixmapManager* manager,
const gfx::GpuMemoryBufferHandle& handle,
const gfx::Size& size,
Format format,
Usage usage,
const DestructionCallback& callback);
+ ~GpuMemoryBufferImplOzoneNativeBuffer() override;
+
// Overridden from gfx::GpuMemoryBuffer:
bool Map(void** data) override;
void Unmap() override;
@@ -29,8 +33,14 @@ class GpuMemoryBufferImplOzoneNativeBuffer : public GpuMemoryBufferImpl {
GpuMemoryBufferImplOzoneNativeBuffer(gfx::GpuMemoryBufferId id,
const gfx::Size& size,
Format format,
+ Usage usage,
const DestructionCallback& callback);
- ~GpuMemoryBufferImplOzoneNativeBuffer() override;
+
+ bool Initialize(ui::NativePixmapManager* manager,
+ const gfx::GpuMemoryBufferHandle& handle);
+
+ scoped_refptr<ui::NativePixmap> pixmap_;
+ Usage usage_;
DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferImplOzoneNativeBuffer);
};

Powered by Google App Engine
This is Rietveld 408576698