Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Unified Diff: cc/image_layer.cc

Issue 11143027: cc: Remove wtf includes from *LayerTextureUpdater headers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Out of line CBCLTU dtor Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/image_layer.h ('k') | cc/layer_texture_updater.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/image_layer.cc
diff --git a/cc/image_layer.cc b/cc/image_layer.cc
index 286ee8bc92f07befcaf42f37c1c57cca51a70ad8..c9260a3012bacf6f4c519ff04d08cece75172f7c 100644
--- a/cc/image_layer.cc
+++ b/cc/image_layer.cc
@@ -35,17 +35,15 @@ public:
ImageLayerTextureUpdater* m_textureUpdater;
};
- static PassRefPtr<ImageLayerTextureUpdater> create()
+ static scoped_refptr<ImageLayerTextureUpdater> create()
{
- return adoptRef(new ImageLayerTextureUpdater());
+ return make_scoped_refptr(new ImageLayerTextureUpdater());
}
- virtual ~ImageLayerTextureUpdater() { }
-
- virtual PassOwnPtr<LayerTextureUpdater::Texture> createTexture(
+ virtual scoped_ptr<LayerTextureUpdater::Texture> createTexture(
CCPrioritizedTextureManager* manager) OVERRIDE
{
- return adoptPtr(new Texture(this, CCPrioritizedTexture::create(manager)));
+ return scoped_ptr<LayerTextureUpdater::Texture>(new Texture(this, CCPrioritizedTexture::create(manager)));
}
virtual SampledTexelFormat sampledTexelFormat(GC3Denum textureFormat) OVERRIDE
@@ -78,6 +76,7 @@ public:
private:
ImageLayerTextureUpdater() { }
+ virtual ~ImageLayerTextureUpdater() { }
SkBitmap m_bitmap;
};
« no previous file with comments | « cc/image_layer.h ('k') | cc/layer_texture_updater.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698