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

android_webview/native/java_browser_view_renderer_helper.cc

 // Copyright (c) 2013 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 "android_webview/native/java_browser_view_renderer_helper.h"
 
 #include <android/bitmap.h>
 
 #include "android_webview/public/browser/draw_sw.h"
 #include "base/android/scoped_java_ref.h"
-#include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
 #include "jni/JavaBrowserViewRendererHelper_jni.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/utils/SkCanvasStateUtils.h"
 
 using base::android::ScopedJavaLocalRef;
 
 namespace android_webview {
 
 namespace {
 
 // Provides software rendering functions from the Android glue layer.
 // Allows preventing extra copies of data when rendering.
 AwDrawSWFunctionTable* g_sw_draw_functions = NULL;
 
 class JavaCanvasHolder : public SoftwareCanvasHolder {
  public:
   JavaCanvasHolder(JNIEnv* env,
                    jobject java_canvas,
                    const gfx::Vector2d& scroll_correction);
   ~JavaCanvasHolder() override;
 
   SkCanvas* GetCanvas() override;
 
  private:
   AwPixelInfo* pixels_;
-  std::unique_ptr<SkCanvas> canvas_;
+  sk_sp<SkCanvas> canvas_;
   DISALLOW_COPY_AND_ASSIGN(JavaCanvasHolder);
 };
 
 JavaCanvasHolder::JavaCanvasHolder(JNIEnv* env,
                                    jobject java_canvas,
                                    const gfx::Vector2d& scroll)
     : pixels_(nullptr) {
   if (!g_sw_draw_functions)
     return;
   pixels_ = g_sw_draw_functions->access_pixels(env, java_canvas);
   if (!pixels_ || !pixels_->state)
     return;
 
-  canvas_ = SkCanvasStateUtils::MakeFromCanvasState(pixels_->state);
+  canvas_ = sk_sp<SkCanvas>(
+      SkCanvasStateUtils::CreateFromCanvasState(pixels_->state));
   // Workarounds for http://crbug.com/271096: SW draw only supports
   // translate & scale transforms, and a simple rectangular clip.
   if (canvas_ && (!canvas_->isClipRect() ||
                   (canvas_->getTotalMatrix().getType() &
                    ~(SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask)))) {
     canvas_.reset();
   }
   if (canvas_) {
     canvas_->translate(scroll.x(), scroll.y());
   }
@@ skipping 17 matching lines @@
                         const gfx::Size size);
   ~AuxiliaryCanvasHolder() override;
 
   SkCanvas* GetCanvas() override;
 
  private:
   ScopedJavaLocalRef<jobject> jcanvas_;
   ScopedJavaLocalRef<jobject> jbitmap_;
   gfx::Vector2d scroll_;
   std::unique_ptr<SkBitmap> bitmap_;
-  std::unique_ptr<SkCanvas> canvas_;
+  sk_sp<SkCanvas> canvas_;
   DISALLOW_COPY_AND_ASSIGN(AuxiliaryCanvasHolder);
 };
 
 AuxiliaryCanvasHolder::AuxiliaryCanvasHolder(
     JNIEnv* env,
     jobject java_canvas,
     const gfx::Vector2d& scroll_correction,
     const gfx::Size size)
     : jcanvas_(env, java_canvas), scroll_(scroll_correction) {
   DCHECK(size.width() > 0);
@@ skipping 12 matching lines @@
   void* pixels = nullptr;
   if (AndroidBitmap_lockPixels(env, jbitmap_.obj(), &pixels) < 0) {
     LOG(ERROR) << "Error locking java bitmap pixels.";
     return;
   }
 
   SkImageInfo info =
       SkImageInfo::MakeN32Premul(bitmap_info.width, bitmap_info.height);
   bitmap_.reset(new SkBitmap);
   bitmap_->installPixels(info, pixels, bitmap_info.stride);
-  canvas_ = base::MakeUnique<SkCanvas>(*bitmap_);
+  canvas_ = sk_make_sp<SkCanvas>(*bitmap_);
 }
 
 AuxiliaryCanvasHolder::~AuxiliaryCanvasHolder() {
   bitmap_.reset();
 
   JNIEnv* env = base::android::AttachCurrentThread();
   if (AndroidBitmap_unlockPixels(env, jbitmap_.obj()) < 0) {
     LOG(ERROR) << "Error unlocking java bitmap pixels.";
     return;
   }
@@ skipping 28 matching lines @@
     holder.reset(new AuxiliaryCanvasHolder(env, java_canvas, scroll_correction,
                                            auxiliary_bitmap_size));
   }
   if (!holder->GetCanvas()) {
     holder.reset();
   }
   return holder;
 }
 
 }  // namespace android_webview