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

cc/raster/gpu_raster_buffer_provider.cc

 // Copyright 2014 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 "cc/raster/gpu_raster_buffer_provider.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 
@@ skipping 42 matching lines @@
         static_cast<float>(playback_rect.size().GetArea()) / full_rect_size;
     float fraction_saved = 1.0f - fraction_partial_rastered;
     UMA_HISTOGRAM_PERCENTAGE(
         base::StringPrintf("Renderer4.%s.PartialRasterPercentageSaved.Gpu",
                            client_name),
         100.0f * fraction_saved);
   }
 
   // Play back raster_source into temp SkPicture.
   SkPictureRecorder recorder;
-  sk_sp<SkCanvas> canvas = sk_ref_sp(
-      recorder.beginRecording(resource_size.width(), resource_size.height()));
+  SkCanvas* canvas =
+      recorder.beginRecording(resource_size.width(), resource_size.height());
   canvas->save();
 
   // The GPU image decode controller assumes that Skia is done with an image
   // when playback is complete. However, in this case, where we play back to a
   // picture, we don't actually finish with the images until the picture is
   // rasterized later. This can cause lifetime issues in the GPU image decode
   // controller. To avoid this, we disable the image hijack canvas (and image
   // decode controller) for this playback step, instead enabling it for the
   // later picture rasterization.
   RasterSource::PlaybackSettings settings = playback_settings;
   settings.use_image_hijack_canvas = false;
-  raster_source->PlaybackToCanvas(canvas.get(), raster_full_rect, playback_rect,
+  raster_source->PlaybackToCanvas(canvas, raster_full_rect, playback_rect,
                                   scales, settings);
   canvas->restore();
   return recorder.finishRecordingAsPicture();
 }
 
 static void RasterizePicture(SkPicture* picture,
                              ContextProvider* context_provider,
                              ResourceProvider::ScopedWriteLockGL* resource_lock,
                              bool async_worker_context_enabled,
                              bool use_distance_field_text,
@@ skipping 193 matching lines @@
   gl->OrderingBarrierCHROMIUM();
 
   // Generate sync token after the barrier for cross context synchronization.
   gpu::SyncToken resource_sync_token;
   gl->GenUnverifiedSyncTokenCHROMIUM(fence_sync, resource_sync_token.GetData());
   resource_lock->set_sync_token(resource_sync_token);
   resource_lock->set_synchronized(!async_worker_context_enabled_);
 }
 
 }  // namespace cc