| Index: cc/texture.h
|
| diff --git a/cc/texture.h b/cc/texture.h
|
| index af5d40b1d0264326c32e87943fd213a2e49b6512..2ab885937199f1c69b800d3cee4583598d3805d4 100644
|
| --- a/cc/texture.h
|
| +++ b/cc/texture.h
|
| @@ -5,35 +5,35 @@
|
| #ifndef CCTexture_h
|
| #define CCTexture_h
|
|
|
| -#include "IntSize.h"
|
| #include "cc/resource_provider.h"
|
| #include "third_party/khronos/GLES2/gl2.h"
|
| +#include "ui/gfx/size.h"
|
|
|
| namespace cc {
|
|
|
| class Texture {
|
| public:
|
| Texture() : m_id(0) { }
|
| - Texture(unsigned id, IntSize size, GLenum format)
|
| + Texture(unsigned id, gfx::Size size, GLenum format)
|
| : m_id(id)
|
| , m_size(size)
|
| , m_format(format) { }
|
|
|
| ResourceProvider::ResourceId id() const { return m_id; }
|
| - const IntSize& size() const { return m_size; }
|
| + const gfx::Size& size() const { return m_size; }
|
| GLenum format() const { return m_format; }
|
|
|
| void setId(ResourceProvider::ResourceId id) { m_id = id; }
|
| - void setDimensions(const IntSize&, GLenum format);
|
| + void setDimensions(const gfx::Size&, GLenum format);
|
|
|
| size_t bytes() const;
|
|
|
| static size_t bytesPerPixel(GLenum format);
|
| - static size_t memorySizeBytes(const IntSize&, GLenum format);
|
| + static size_t memorySizeBytes(const gfx::Size&, GLenum format);
|
|
|
| private:
|
| ResourceProvider::ResourceId m_id;
|
| - IntSize m_size;
|
| + gfx::Size m_size;
|
| GLenum m_format;
|
| };
|
|
|
|
|