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

content/browser/compositor/software_output_device_win.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 "content/browser/compositor/software_output_device_win.h"
 
 #include "base/debug/alias.h"
 #include "base/memory/shared_memory.h"
 #include "cc/resources/shared_bitmap.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 121 matching lines @@
     if (backing_) {
       base::SharedMemory* memory =
           backing_->GetSharedMemory(viewport_pixel_size_);
       if (memory) {
         shared_section = memory->handle().GetHandle();
       } else {
         can_create_contents = false;
       }
     }
     if (can_create_contents) {
-      contents_ = skia::CreatePlatformCanvas(
+      contents_ = sk_sp<SkCanvas>(skia::CreatePlatformCanvas(
           viewport_pixel_size_.width(), viewport_pixel_size_.height(), true,
-          shared_section, skia::CRASH_ON_FAILURE);
+          shared_section, skia::CRASH_ON_FAILURE));
     }
   }
 
   damage_rect_ = damage_rect;
   in_paint_ = true;
   return contents_.get();
 }
 
 void SoftwareOutputDeviceWin::EndPaint() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ skipping 30 matching lines @@
   } else {
     HDC hdc = ::GetDC(hwnd_);
     RECT src_rect = rect.ToRECT();
     skia::DrawToNativeContext(contents_.get(), hdc, rect.x(), rect.y(),
                               &src_rect);
     ::ReleaseDC(hwnd_, hdc);
   }
 }
 
 void SoftwareOutputDeviceWin::ReleaseContents() {
+  DCHECK(!contents_ || contents_->unique());
   DCHECK(!in_paint_);
   contents_.reset();
 }
 
 }  // namespace content