| Index: ui/gfx/compositor/compositor.h
|
| diff --git a/ui/gfx/compositor/compositor.h b/ui/gfx/compositor/compositor.h
|
| index 5d8cc96b629023c0bfd2c6a2d150fe3179bbe509..9475cf62445acfe2de8b85b8450cbaba2fe1cf07 100644
|
| --- a/ui/gfx/compositor/compositor.h
|
| +++ b/ui/gfx/compositor/compositor.h
|
| @@ -38,7 +38,7 @@ class Layer;
|
| // a global object.
|
| class COMPOSITOR_EXPORT ContextFactory {
|
| public:
|
| - virtual ~ContextFactory() { }
|
| + virtual ~ContextFactory() {}
|
|
|
| // Gets the global instance.
|
| static ContextFactory* GetInstance();
|
| @@ -97,14 +97,18 @@ class COMPOSITOR_EXPORT DefaultContextFactory : public ContextFactory {
|
| class COMPOSITOR_EXPORT Texture : public base::RefCounted<Texture> {
|
| public:
|
| Texture(bool flipped, const gfx::Size& size);
|
| - virtual ~Texture();
|
|
|
| unsigned int texture_id() const { return texture_id_; }
|
| void set_texture_id(unsigned int id) { texture_id_ = id; }
|
| bool flipped() const { return flipped_; }
|
| gfx::Size size() const { return size_; }
|
|
|
| + protected:
|
| + virtual ~Texture();
|
| +
|
| private:
|
| + friend class base::RefCounted<Texture>;
|
| +
|
| unsigned int texture_id_;
|
| bool flipped_;
|
| gfx::Size size_;
|
|
|