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..5fb6197147894776033069c7454f9fa3d4ab7292 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,11 @@ |
#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/containers/hash_tables.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 +50,11 @@ class GpuMemoryBufferFactoryOzoneNativePixmap : public GpuMemoryBufferFactory, |
int client_id) override; |
private: |
- ui::GpuMemoryBufferFactoryOzoneNativePixmap ozone_native_pixmap_factory_; |
+ using BufferToPixmapMapKey = std::pair<int, int>; |
+ using BufferToPixmapMap = |
+ base::hash_map<BufferToPixmapMapKey, scoped_refptr<ui::NativePixmap>>; |
+ BufferToPixmapMap native_pixmaps_; |
+ base::Lock native_pixmaps_lock_; |
DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferFactoryOzoneNativePixmap); |
}; |