| 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;
|
| }
|
|
|
|
|