| Index: cc/bitmap_skpicture_canvas_layer_texture_updater.cc
|
| diff --git a/cc/bitmap_skpicture_canvas_layer_texture_updater.cc b/cc/bitmap_skpicture_canvas_layer_texture_updater.cc
|
| index 4469380ff7c4422b820e4b68d6e9e653dc200c36..63780422587dc4ebea2ccb48ad05a421a8b088bb 100644
|
| --- a/cc/bitmap_skpicture_canvas_layer_texture_updater.cc
|
| +++ b/cc/bitmap_skpicture_canvas_layer_texture_updater.cc
|
| @@ -41,9 +41,9 @@ void BitmapSkPictureCanvasLayerTextureUpdater::Texture::update(CCTextureUpdateQu
|
| queue.appendFullUpload(upload);
|
| }
|
|
|
| -PassRefPtr<BitmapSkPictureCanvasLayerTextureUpdater> BitmapSkPictureCanvasLayerTextureUpdater::create(scoped_ptr<LayerPainterChromium> painter)
|
| +scoped_refptr<BitmapSkPictureCanvasLayerTextureUpdater> BitmapSkPictureCanvasLayerTextureUpdater::create(scoped_ptr<LayerPainterChromium> painter)
|
| {
|
| - return adoptRef(new BitmapSkPictureCanvasLayerTextureUpdater(painter.Pass()));
|
| + return make_scoped_refptr(new BitmapSkPictureCanvasLayerTextureUpdater(painter.Pass()));
|
| }
|
|
|
| BitmapSkPictureCanvasLayerTextureUpdater::BitmapSkPictureCanvasLayerTextureUpdater(scoped_ptr<LayerPainterChromium> painter)
|
| @@ -55,9 +55,9 @@ BitmapSkPictureCanvasLayerTextureUpdater::~BitmapSkPictureCanvasLayerTextureUpda
|
| {
|
| }
|
|
|
| -PassOwnPtr<LayerTextureUpdater::Texture> BitmapSkPictureCanvasLayerTextureUpdater::createTexture(CCPrioritizedTextureManager* manager)
|
| +scoped_ptr<LayerTextureUpdater::Texture> BitmapSkPictureCanvasLayerTextureUpdater::createTexture(CCPrioritizedTextureManager* manager)
|
| {
|
| - return adoptPtr(new Texture(this, CCPrioritizedTexture::create(manager)));
|
| + return scoped_ptr<LayerTextureUpdater::Texture>(new Texture(this, CCPrioritizedTexture::create(manager)));
|
| }
|
|
|
| LayerTextureUpdater::SampledTexelFormat BitmapSkPictureCanvasLayerTextureUpdater::sampledTexelFormat(GC3Denum textureFormat)
|
|
|