ozone: unify GpuMemoryBufferFactoryOzoneNativePixmap in content/

content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h

 // 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.
 
 #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;
 }
 
 namespace content {
 
 class GpuMemoryBufferFactoryOzoneNativePixmap : public GpuMemoryBufferFactory,
                                                 public gpu::ImageFactory {
  public:
@@ skipping 20 matching lines @@
 
   // Overridden from gpu::ImageFactory:
   scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer(
       const gfx::GpuMemoryBufferHandle& handle,
       const gfx::Size& size,
       gfx::GpuMemoryBuffer::Format format,
       unsigned internalformat,
       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
GpuMemoryBufferFactoryIOSurface/SurfaceTexture:

using NativePixmapMapKey = std::pair<int, int>;
using NativePixmapMap = base::hash_map<NativePixmapMapKey,
scoped_refptr<ui::NativePixmap>>;
NativePixmapMap native_pixmaps_;
base::Lock native_pixmaps_lock_;

[dshwang, 2015/07/24 19:57:20]

cool. Done.

 
   DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferFactoryOzoneNativePixmap);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_OZONE_NATIVE_PIXMAP_H_