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

Unified Diff: ui/gl/gl_image_shared_memory.h

Issue 1421903006: ui/gl: Move GLImage into gl namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ozone demo 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
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 1d865a403912d236fa1a9aafc8988e9f4f690918..e3425d2a516e84576b2547032c45aee438038ed4 100644
--- a/ui/gl/gl_image_shared_memory.h
+++ b/ui/gl/gl_image_shared_memory.h
@@ -14,15 +14,15 @@ namespace base {
class SharedMemory;
}
-namespace gfx {
+namespace gl {
class GL_EXPORT GLImageSharedMemory : public GLImageMemory {
public:
- GLImageSharedMemory(const Size& size, unsigned internalformat);
+ GLImageSharedMemory(const gfx::Size& size, unsigned internalformat);
bool Initialize(const base::SharedMemoryHandle& handle,
- GenericSharedMemoryId shared_memory_id,
- BufferFormat format,
+ gfx::GenericSharedMemoryId shared_memory_id,
+ gfx::BufferFormat format,
size_t offset);
// Overridden from GLImage:
@@ -36,11 +36,11 @@ class GL_EXPORT GLImageSharedMemory : public GLImageMemory {
private:
scoped_ptr<base::SharedMemory> shared_memory_;
- GenericSharedMemoryId shared_memory_id_;
+ gfx::GenericSharedMemoryId shared_memory_id_;
DISALLOW_COPY_AND_ASSIGN(GLImageSharedMemory);
};
-} // namespace gfx
+} // namespace gl
#endif // UI_GL_GL_IMAGE_SHARED_MEMORY_H_

Powered by Google App Engine
This is Rietveld 408576698