| Index: content/renderer/pepper/ppb_image_data_impl.cc
|
| diff --git a/content/renderer/pepper/ppb_image_data_impl.cc b/content/renderer/pepper/ppb_image_data_impl.cc
|
| index 7b8740b1ebd31cd65879ea674fbc49c9d19dff1f..8687941aa9cf259b3a926e45a9cbbbc17c643ce4 100644
|
| --- a/content/renderer/pepper/ppb_image_data_impl.cc
|
| +++ b/content/renderer/pepper/ppb_image_data_impl.cc
|
| @@ -171,8 +171,7 @@ TransportDIB* ImageDataPlatformBackend::GetTransportDIB() const {
|
| void* ImageDataPlatformBackend::Map() {
|
| if (!mapped_canvas_) {
|
| const bool is_opaque = false;
|
| - mapped_canvas_ =
|
| - sk_sp<SkCanvas>(dib_->GetPlatformCanvas(width_, height_, is_opaque));
|
| + mapped_canvas_.reset(dib_->GetPlatformCanvas(width_, height_, is_opaque));
|
| if (!mapped_canvas_)
|
| return NULL;
|
| }
|
| @@ -250,7 +249,7 @@ void* ImageDataSimpleBackend::Map() {
|
| skia_bitmap_.setPixels(shared_memory_->memory());
|
| // Our platform bitmaps are set to opaque by default, which we don't want.
|
| skia_bitmap_.setAlphaType(kPremul_SkAlphaType);
|
| - skia_canvas_ = sk_make_sp<SkCanvas>(skia_bitmap_);
|
| + skia_canvas_ = base::MakeUnique<SkCanvas>(skia_bitmap_);
|
| return skia_bitmap_.getAddr32(0, 0);
|
| }
|
| return shared_memory_->memory();
|
|
|