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

Unified Diff: ui/gl/gl_image_surface_texture.h

Issue 195583003: Add initial GpuMemoryBufferSurfaceTexture implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 9 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_android.cc ('k') | ui/gl/gl_image_surface_texture.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_image_surface_texture.h
diff --git a/ui/gl/gl_image_shm.h b/ui/gl/gl_image_surface_texture.h
similarity index 55%
copy from ui/gl/gl_image_shm.h
copy to ui/gl/gl_image_surface_texture.h
index 079bab90d0ad4164e3070d245836ff3944221e35..0b771a37f8bafb62888dc5a17e2257e66845c1fe 100644
--- a/ui/gl/gl_image_shm.h
+++ b/ui/gl/gl_image_surface_texture.h
@@ -1,19 +1,21 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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_GL_GL_IMAGE_SHM_H_
-#define UI_GL_GL_IMAGE_SHM_H_
+#ifndef UI_GL_GL_IMAGE_SURFACE_TEXTURE_H_
+#define UI_GL_GL_IMAGE_SURFACE_TEXTURE_H_
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
#include "ui/gl/gl_bindings.h"
#include "ui/gl/gl_image.h"
namespace gfx {
-class GL_EXPORT GLImageShm : public GLImage {
+class SurfaceTexture;
+
+class GL_EXPORT GLImageSurfaceTexture : public GLImage {
public:
- GLImageShm(gfx::Size size, unsigned internalformat);
+ explicit GLImageSurfaceTexture(gfx::Size size);
bool Initialize(gfx::GpuMemoryBufferHandle buffer);
@@ -28,21 +30,16 @@ class GL_EXPORT GLImageShm : public GLImage {
virtual void DidModifyTexImage() OVERRIDE {}
protected:
- virtual ~GLImageShm();
+ virtual ~GLImageSurfaceTexture();
private:
- scoped_ptr<base::SharedMemory> shared_memory_;
+ scoped_refptr<SurfaceTexture> surface_texture_;
gfx::Size size_;
- unsigned internalformat_;
-#if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || \
- defined(USE_OZONE)
- GLuint egl_texture_id_;
- EGLImageKHR egl_image_;
-#endif
-
- DISALLOW_COPY_AND_ASSIGN(GLImageShm);
+ GLint texture_id_;
+
+ DISALLOW_COPY_AND_ASSIGN(GLImageSurfaceTexture);
};
} // namespace gfx
-#endif // UI_GL_GL_IMAGE_SHM_H_
+#endif // UI_GL_GL_IMAGE_SURFACE_TEXTURE_H_
« no previous file with comments | « ui/gl/gl_image_android.cc ('k') | ui/gl/gl_image_surface_texture.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698