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

Unified Diff: cc/tiled_layer_impl.cc

Issue 11144023: cc: Store tiles, painters, tiling data in scoped_ptr (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased 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/tiled_layer_impl.h ('k') | cc/tiled_layer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/tiled_layer_impl.cc
diff --git a/cc/tiled_layer_impl.cc b/cc/tiled_layer_impl.cc
index 96dc09ad7e92be2a38d935c17868a12b7d1ea206..511ca954cb02b0705ca1267ccee6ef2b59f69d85 100644
--- a/cc/tiled_layer_impl.cc
+++ b/cc/tiled_layer_impl.cc
@@ -46,7 +46,7 @@ static const int debugTileInvalidatedCheckerboardColorBlue = 245;
class DrawableTile : public CCLayerTilingData::Tile {
public:
- static PassOwnPtr<DrawableTile> create() { return adoptPtr(new DrawableTile()); }
+ static scoped_ptr<DrawableTile> create() { return make_scoped_ptr(new DrawableTile()); }
CCResourceProvider::ResourceId resourceId() const { return m_resourceId; }
void setResourceId(CCResourceProvider::ResourceId resourceId) { m_resourceId = resourceId; }
@@ -106,9 +106,9 @@ DrawableTile* CCTiledLayerImpl::tileAt(int i, int j) const
DrawableTile* CCTiledLayerImpl::createTile(int i, int j)
{
- OwnPtr<DrawableTile> tile(DrawableTile::create());
+ scoped_ptr<DrawableTile> tile(DrawableTile::create());
DrawableTile* addedTile = tile.get();
- m_tiler->addTile(tile.release(), i, j);
+ m_tiler->addTile(tile.PassAs<CCLayerTilingData::Tile>(), i, j);
return addedTile;
}
« no previous file with comments | « cc/tiled_layer_impl.h ('k') | cc/tiled_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698