From 69f5c512aab9f49acc51bd2aae7bbc2384f37e19 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@mozilla.com>
Date: Tue, 9 May 2017 22:31:07 -0400
Subject: [PATCH] Bug 1340627 - part 6 - fix layers for Skia m59. r=mchang

MozReview-Commit-ID: 6pAV6FKDFQ4
---
 gfx/layers/composite/PaintCounter.cpp | 6 +++---
 gfx/layers/composite/PaintCounter.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gfx/layers/composite/PaintCounter.cpp b/gfx/layers/composite/PaintCounter.cpp
index 56e57aab45a30..a8f619fed9c35 100644
--- a/gfx/layers/composite/PaintCounter.cpp
+++ b/gfx/layers/composite/PaintCounter.cpp
@@ -29,9 +29,9 @@ PaintCounter::PaintCounter()
   mSurface = Factory::CreateDataSourceSurface(mRect.Size(), mFormat);
   mStride = mSurface->Stride();
 
-  mCanvas.reset(
-    SkCanvas::NewRasterDirect(MakeSkiaImageInfo(mRect.Size(), mFormat),
-                              mSurface->GetData(), mStride));
+  mCanvas =
+    SkCanvas::MakeRasterDirect(MakeSkiaImageInfo(mRect.Size(), mFormat),
+                              mSurface->GetData(), mStride);
   mCanvas->clear(SK_ColorWHITE);
 }
 
diff --git a/gfx/layers/composite/PaintCounter.h b/gfx/layers/composite/PaintCounter.h
index b5296939fc2f3..c4429d409de4d 100644
--- a/gfx/layers/composite/PaintCounter.h
+++ b/gfx/layers/composite/PaintCounter.h
@@ -33,7 +33,7 @@ class PaintCounter {
   virtual ~PaintCounter();
 
   SurfaceFormat mFormat;
-  sk_sp<SkCanvas> mCanvas;
+  std::unique_ptr<SkCanvas> mCanvas;
   IntSize mSize;
   int mStride;