diff options
Diffstat (limited to 'ui/gl/gl_image_io_surface.h')
-rw-r--r-- | ui/gl/gl_image_io_surface.h | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/ui/gl/gl_image_io_surface.h b/ui/gl/gl_image_io_surface.h index 56b4478..45bd3ac 100644 --- a/ui/gl/gl_image_io_surface.h +++ b/ui/gl/gl_image_io_surface.h @@ -9,7 +9,8 @@ #include "base/mac/scoped_cftyperef.h" #include "base/threading/thread_checker.h" -#include "ui/gfx/gpu_memory_buffer.h" +#include "ui/gfx/buffer_types.h" +#include "ui/gfx/generic_shared_memory_id.h" #include "ui/gl/gl_image.h" #if defined(__OBJC__) @@ -22,26 +23,23 @@ namespace gfx { class GL_EXPORT GLImageIOSurface : public GLImage { public: - GLImageIOSurface(const gfx::Size& size, unsigned internalformat); + GLImageIOSurface(const Size& size, unsigned internalformat); bool Initialize(IOSurfaceRef io_surface, - gfx::GenericSharedMemoryId io_surface_id, + GenericSharedMemoryId io_surface_id, BufferFormat format); // Overridden from GLImage: void Destroy(bool have_context) override; - gfx::Size GetSize() override; + Size GetSize() override; unsigned GetInternalFormat() override; bool BindTexImage(unsigned target) override; void ReleaseTexImage(unsigned target) override {} + bool CopyTexImage(unsigned target) override; bool CopyTexSubImage(unsigned target, const Point& offset, const Rect& rect) override; - void WillUseTexImage() override {} - void DidUseTexImage() override {} - void WillModifyTexImage() override {} - void DidModifyTexImage() override {} - bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget, + bool ScheduleOverlayPlane(AcceleratedWidget widget, int z_order, OverlayTransform transform, const Rect& bounds_rect, @@ -52,18 +50,17 @@ class GL_EXPORT GLImageIOSurface : public GLImage { base::ScopedCFTypeRef<IOSurfaceRef> io_surface(); - static void SetLayerForWidget(gfx::AcceleratedWidget widget, - CALayer* layer); + static void SetLayerForWidget(AcceleratedWidget widget, CALayer* layer); protected: ~GLImageIOSurface() override; private: - const gfx::Size size_; + const Size size_; const unsigned internalformat_; BufferFormat format_; base::ScopedCFTypeRef<IOSurfaceRef> io_surface_; - gfx::GenericSharedMemoryId io_surface_id_; + GenericSharedMemoryId io_surface_id_; base::ThreadChecker thread_checker_; DISALLOW_COPY_AND_ASSIGN(GLImageIOSurface); |