Bug 1340627 - part 6 - fix layers for Skia m59. r=mchang

MozReview-Commit-ID: 6pAV6FKDFQ4

gfx/layers/composite/PaintCounter.cpp

@@ -29,9 +29,9 @@ PaintCounter::PaintCounter()
   mSurface = Factory::CreateDataSourceSurface(mRect.Size(), mFormat);
   mStride = mSurface->Stride();
 
-  mCanvas.reset(
+  mCanvas =
-    SkCanvas::NewRasterDirect(MakeSkiaImageInfo(mRect.Size(), mFormat),
+    SkCanvas::MakeRasterDirect(MakeSkiaImageInfo(mRect.Size(), mFormat),
-                              mSurface->GetData(), mStride));
+                              mSurface->GetData(), mStride);
   mCanvas->clear(SK_ColorWHITE);
 }
 

gfx/layers/composite/PaintCounter.h

@@ -33,7 +33,7 @@ private:
   virtual ~PaintCounter();
 
   SurfaceFormat mFormat;
-  sk_sp<SkCanvas> mCanvas;
+  std::unique_ptr<SkCanvas> mCanvas;
   IntSize mSize;
   int mStride;