Index: ui/gfx/compositor/compositor.h |
diff --git a/ui/gfx/compositor/compositor.h b/ui/gfx/compositor/compositor.h |
index 5d8cc96b629023c0bfd2c6a2d150fe3179bbe509..684ca09ed5cb013f9416956116b616eb544827cc 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,7 +97,6 @@ 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; } |
@@ -105,6 +104,9 @@ class COMPOSITOR_EXPORT Texture : public base::RefCounted<Texture> { |
gfx::Size size() const { return size_; } |
private: |
+ friend class base::RefCounted<Texture>; |
+ ~Texture(); |
piman
2012/04/30 17:08:05
needs to stay virtual+protected, the class is exte
Ryan Sleevi
2012/04/30 17:12:59
Done.
|
+ |
unsigned int texture_id_; |
bool flipped_; |
gfx::Size size_; |