| Index: ui/gl/gl_image_memory.h
|
| diff --git a/ui/gl/gl_image_memory.h b/ui/gl/gl_image_memory.h
|
| index 6dbec46bfe55ca894757ee296b756662021b0962..24b42d38b460f68e9e37c30b6a16d6d51da5ca53 100644
|
| --- a/ui/gl/gl_image_memory.h
|
| +++ b/ui/gl/gl_image_memory.h
|
| @@ -13,13 +13,16 @@
|
| #include <EGL/eglext.h>
|
| #endif
|
|
|
| +#include "ui/gfx/gpu_memory_buffer.h"
|
| +
|
| namespace gfx {
|
|
|
| class GL_EXPORT GLImageMemory : public GLImage {
|
| public:
|
| GLImageMemory(const gfx::Size& size, unsigned internalformat);
|
|
|
| - bool Initialize(const unsigned char* memory);
|
| + bool Initialize(const unsigned char* memory,
|
| + gfx::GpuMemoryBuffer::Format format);
|
|
|
| // Overridden from GLImage:
|
| virtual void Destroy(bool have_context) OVERRIDE;
|
| @@ -40,15 +43,15 @@ class GL_EXPORT GLImageMemory : public GLImage {
|
| protected:
|
| virtual ~GLImageMemory();
|
|
|
| - bool HasValidFormat() const;
|
| - size_t Bytes() const;
|
| + static size_t BytesPerPixel(gfx::GpuMemoryBuffer::Format format);
|
|
|
| private:
|
| void DoBindTexImage(unsigned target);
|
|
|
| - const unsigned char* memory_;
|
| const gfx::Size size_;
|
| const unsigned internalformat_;
|
| + const unsigned char* memory_;
|
| + gfx::GpuMemoryBuffer::Format format_;
|
| bool in_use_;
|
| unsigned target_;
|
| bool need_do_bind_tex_image_;
|
|
|