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

Unified Diff: ui/ozone/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: resolve nits 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
Index: ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h
diff --git a/ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h b/ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h
deleted file mode 100644
index b5393a35778ed4d145b636995b190a085e496a9d..0000000000000000000000000000000000000000
--- a/ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h
+++ /dev/null
@@ -1,67 +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.
-
-#ifndef UI_OZONE_GPU_GPU_MEMORY_BUFFER_FACTORY_OZONE_NATIVE_PIXMAP_H_
-#define UI_OZONE_GPU_GPU_MEMORY_BUFFER_FACTORY_OZONE_NATIVE_PIXMAP_H_
-
-#include <map>
-
-#include "base/memory/ref_counted.h"
-#include "base/synchronization/lock.h"
-#include "ui/gfx/geometry/size.h"
-#include "ui/gfx/gpu_memory_buffer.h"
-#include "ui/gfx/native_widget_types.h"
-#include "ui/ozone/gpu/ozone_gpu_export.h"
-#include "ui/ozone/public/native_pixmap.h"
-
-namespace gfx {
-class GLImage;
-}
-
-namespace ui {
-class NativePixmap;
-
-class OZONE_GPU_EXPORT GpuMemoryBufferFactoryOzoneNativePixmap {
- typedef std::map<std::pair<uint32_t, uint32_t>, scoped_refptr<NativePixmap>>
- BufferToPixmapMap;
-
- public:
- GpuMemoryBufferFactoryOzoneNativePixmap();
- virtual ~GpuMemoryBufferFactoryOzoneNativePixmap();
-
- // Creates a GPU memory buffer identified by |id|.
- // It can be called on any thread.
- bool CreateGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
- const gfx::Size& size,
- gfx::GpuMemoryBuffer::Format format,
- gfx::GpuMemoryBuffer::Usage usage,
- int client_id,
- gfx::PluginWindowHandle surface_handle);
-
- // Destroys GPU memory buffer identified by |id|.
- // It can be called on any thread.
- void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id, int client_id);
-
- // Creates a GLImage instance for GPU memory buffer identified by |id|.
- scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer(
- gfx::GpuMemoryBufferId id,
- const gfx::Size& size,
- gfx::GpuMemoryBuffer::Format format,
- unsigned internalformat,
- int client_id);
-
- static scoped_refptr<gfx::GLImage> CreateImageForPixmap(
- scoped_refptr<NativePixmap> pixmap,
- const gfx::Size& size,
- gfx::GpuMemoryBuffer::Format format,
- unsigned internalformat);
-
- private:
- BufferToPixmapMap native_pixmap_map_;
- base::Lock native_pixmap_map_lock_;
-};
-
-} // namespace ui
-
-#endif // UI_OZONE_GPU_GPU_MEMORY_BUFFER_FACTORY_OZONE_NATIVE_PIXMAP_H_

Powered by Google App Engine
This is Rietveld 408576698