Revert "Revert "Change call-sites now that SkCanvas is not ref-counted""

ppapi/proxy/ppb_image_data_proxy.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/proxy/ppb_image_data_proxy.h"
 
 #include <string.h>  // For memcpy
 
 #include <map>
 #include <vector>
@@ skipping 370 matching lines @@
 
 PlatformImageData::~PlatformImageData() {
 }
 
 void* PlatformImageData::Map() {
   if (!mapped_canvas_.get()) {
     if (!transport_dib_.get())
       return NULL;
 
     const bool is_opaque = false;
-    mapped_canvas_ =
-        sk_sp<SkCanvas>(transport_dib_->GetPlatformCanvas(desc_.size.width,
-                                                          desc_.size.height,
-                                                          is_opaque));
+    mapped_canvas_ = transport_dib_->GetPlatformCanvas(
+        desc_.size.width, desc_.size.height, is_opaque);
     if (!mapped_canvas_.get())
       return NULL;
   }
   SkPixmap pixmap;
   skia::GetWritablePixels(mapped_canvas_.get(), &pixmap);
   return pixmap.writable_addr();
 }
 
 void PlatformImageData::Unmap() {
   // TODO(brettw) have a way to unmap a TransportDIB. Currently this isn't
@@ skipping 265 matching lines @@
   // still cached in our process, the proxy still holds a reference so we can
   // remove the one the renderer just sent is. If the proxy no longer holds a
   // reference, we released everything and we should also release the one the
   // renderer just sent us.
   dispatcher()->Send(new PpapiHostMsg_PPBCore_ReleaseResource(
       API_ID_PPB_CORE, old_image_data));
 }
 
 }  // namespace proxy
 }  // namespace ppapi