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

Unified Diff: ui/gl/gl_image_shared_memory.h

Issue 1390143002: Revert of Re-land: ui: Add GLImage unit test framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 | « ui/gl/gl_image_ref_counted_memory_unittest.cc ('k') | ui/gl/gl_image_shared_memory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_image_shared_memory.h
diff --git a/ui/gl/gl_image_shared_memory.h b/ui/gl/gl_image_shared_memory.h
index 622eb3da174f141980fa2e2068aff1fcdffd85d9..d9233cb1fc38584e84ba55fa379f8145b0229f65 100644
--- a/ui/gl/gl_image_shared_memory.h
+++ b/ui/gl/gl_image_shared_memory.h
@@ -6,7 +6,7 @@
#define UI_GL_GL_IMAGE_SHARED_MEMORY_H_
#include "base/memory/scoped_ptr.h"
-#include "base/memory/shared_memory_handle.h"
+#include "ui/gfx/gpu_memory_buffer.h"
#include "ui/gl/gl_image_memory.h"
namespace gfx {
@@ -15,9 +15,8 @@
public:
GLImageSharedMemory(const gfx::Size& size, unsigned internalformat);
- bool Initialize(const base::SharedMemoryHandle& handle,
- gfx::GenericSharedMemoryId shared_memory_id,
- BufferFormat format);
+ bool Initialize(const gfx::GpuMemoryBufferHandle& handle,
+ gfx::BufferFormat format);
// Overridden from GLImage:
void Destroy(bool have_context) override;
@@ -30,7 +29,7 @@
private:
scoped_ptr<base::SharedMemory> shared_memory_;
- GenericSharedMemoryId shared_memory_id_;
+ gfx::GenericSharedMemoryId shared_memory_id_;
DISALLOW_COPY_AND_ASSIGN(GLImageSharedMemory);
};
« no previous file with comments | « ui/gl/gl_image_ref_counted_memory_unittest.cc ('k') | ui/gl/gl_image_shared_memory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698