Chromium Code Reviews| Index: ui/gl/gl_image_io_surface.h |
| diff --git a/ui/gl/gl_image_egl.h b/ui/gl/gl_image_io_surface.h |
| similarity index 60% |
| copy from ui/gl/gl_image_egl.h |
| copy to ui/gl/gl_image_io_surface.h |
| index 31dd008059affccbeb503179540cb2cbd0155101..8b2f25b186bc470d8e8c2147d79b51455533134f 100644 |
| --- a/ui/gl/gl_image_egl.h |
| +++ b/ui/gl/gl_image_io_surface.h |
| @@ -2,17 +2,17 @@ |
| // 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_EGL_H_ |
| -#define UI_GL_GL_IMAGE_EGL_H_ |
| +#ifndef UI_GL_GL_IMAGE_IO_SURFACE_H_ |
| +#define UI_GL_GL_IMAGE_IO_SURFACE_H_ |
| -#include "ui/gl/gl_bindings.h" // for EGLImageKHR |
| +#include "base/mac/scoped_cftyperef.h" |
| #include "ui/gl/gl_image.h" |
| namespace gfx { |
| -class GL_EXPORT GLImageEGL : public GLImage { |
| +class GL_EXPORT GLImageIOSurface : public GLImage { |
| public: |
| - explicit GLImageEGL(gfx::Size size); |
| + explicit GLImageIOSurface(gfx::Size size); |
| bool Initialize(gfx::GpuMemoryBufferHandle buffer); |
| @@ -23,21 +23,17 @@ class GL_EXPORT GLImageEGL : public GLImage { |
| virtual void ReleaseTexImage(unsigned target) OVERRIDE; |
| virtual void WillUseTexImage() OVERRIDE; |
| virtual void DidUseTexImage() OVERRIDE; |
| - virtual void SetReleaseAfterUse() OVERRIDE; |
| protected: |
| - virtual ~GLImageEGL(); |
| + virtual ~GLImageIOSurface(); |
| private: |
| - EGLImageKHR egl_image_; |
| - gfx::Size size_; |
| - bool release_after_use_; |
| - bool in_use_; |
| - unsigned target_; |
| + DISALLOW_COPY_AND_ASSIGN(GLImageIOSurface); |
|
piman
2013/12/03 02:59:51
nit: make this the last statement in the class def
|
| - DISALLOW_COPY_AND_ASSIGN(GLImageEGL); |
| + base::ScopedCFTypeRef<CFTypeRef> io_surface_; |
| + gfx::Size size_; |
| }; |
| } // namespace gfx |
| -#endif // UI_GL_GL_IMAGE_EGL_H_ |
| +#endif // UI_GL_GL_IMAGE_IO_SURFACE_H_ |