diff options
author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 17:32:48 +0000 |
---|---|---|
committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 17:32:48 +0000 |
commit | 321fe370f8198af37285f853cbff853bc34a38d1 (patch) | |
tree | ef4d680ab399bf0d90e426c411067a5f70374297 /cc/image_layer.cc | |
parent | 5d26b477fdbcdee36696db414806e043e2c09d97 (diff) | |
download | chromium_src-321fe370f8198af37285f853cbff853bc34a38d1.zip chromium_src-321fe370f8198af37285f853cbff853bc34a38d1.tar.gz chromium_src-321fe370f8198af37285f853cbff853bc34a38d1.tar.bz2 |
cc: Remove wtf includes from *LayerTextureUpdater headers
BUG=154451
Review URL: https://chromiumcodereview.appspot.com/11143027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/image_layer.cc')
-rw-r--r-- | cc/image_layer.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cc/image_layer.cc b/cc/image_layer.cc index 286ee8b..c9260a3 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; }; |