content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h - Issue 1258713002: ozone: unify GpuMemoryBufferFactoryOzoneNativePixmap in content/

Unified Diff: content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h

Issue 1258713002: ozone: unify GpuMemoryBufferFactoryOzoneNativePixmap in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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

« no previous file with comments | « no previous file | content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc » ('j') | content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h

diff --git a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h

index 3e84cebebc19ab3bc1f156d17808430edb766209..5a9b19f88ebbc64697a8a81be0f316c6a651f664 100644

--- a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h

+++ b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h

@@ -5,12 +5,10 @@

#ifndef CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_OZONE_NATIVE_PIXMAP_H_

#define CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_OZONE_NATIVE_PIXMAP_H_

-#include "base/memory/ref_counted.h"

+#include "base/synchronization/lock.h"

#include "content/common/gpu/gpu_memory_buffer_factory.h"

#include "gpu/command_buffer/service/image_factory.h"

-#include "ui/gfx/geometry/size.h"

-#include "ui/gfx/gpu_memory_buffer.h"

-#include "ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h"

+#include "ui/ozone/public/native_pixmap.h"

namespace gfx {

class GLImage;

@@ -51,7 +49,10 @@ class GpuMemoryBufferFactoryOzoneNativePixmap : public GpuMemoryBufferFactory,

int client_id) override;

private:

- ui::GpuMemoryBufferFactoryOzoneNativePixmap ozone_native_pixmap_factory_;

+ typedef std::map<std::pair<uint32_t, uint32_t>,

piman 2015/07/24 18:41:25 nit: hash_map.

dshwang 2015/07/24 19:57:20 Done.

+ scoped_refptr<ui::NativePixmap>> BufferToPixmapMap;

+ BufferToPixmapMap native_pixmap_map_;

+ base::Lock native_pixmap_map_lock_;

reveman 2015/07/24 19:13:17 nit: make all this consistent with GpuMemoryBuffer

dshwang 2015/07/24 19:57:20 cool. Done.

DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferFactoryOzoneNativePixmap);

};