commit 79fc3b1f1675364dbb739ffa511a68ed5a80f357
author Matt Sarett <msarett@google.com> Thu Mar 24 11:02:44 2016 -0400
committer Derek Sollenberger <djsollen@google.com> Fri Jul 15 08:19:11 2016 -0400
tree 3c2474b1d6e82d1d7b328185b75a5d169d2da858
parent 0d4604cdb280c59e596023e844211118a358a6b6

Update SkiaCanvasProxy with SkSurface API change

(cherry picked from commit 187b99292d0bf86e9e76b0c8d447abcbefe29afb)

Change-Id: I09a5ae6a844dec4607bc3f45e22dad93a00c0dc8

libs/hwui/SkiaCanvasProxy.cpp

diff --git a/libs/hwui/SkiaCanvasProxy.cpp b/libs/hwui/SkiaCanvasProxy.cpp
index 9df32b28..f264a35 100644
--- a/libs/hwui/SkiaCanvasProxy.cpp
+++ b/libs/hwui/SkiaCanvasProxy.cpp
@@ -23,6 +23,7 @@
 #include <SkPixelRef.h>
 #include <SkRect.h>
 #include <SkRRect.h>
+#include <SkSurface.h>
 
 #include <memory>
 
@@ -153,7 +154,7 @@
     mCanvas->drawVertices(mode, floatCount, vArray, tArray, cArray, indices, indexCount, paint);
 }
 
-SkSurface* SkiaCanvasProxy::onNewSurface(const SkImageInfo&, const SkSurfaceProps&) {
+sk_sp<SkSurface> SkiaCanvasProxy::onNewSurface(const SkImageInfo&, const SkSurfaceProps&) {
     SkDEBUGFAIL("SkiaCanvasProxy::onNewSurface is not supported");
     return NULL;
 }

libs/hwui/SkiaCanvasProxy.h

diff --git a/libs/hwui/SkiaCanvasProxy.h b/libs/hwui/SkiaCanvasProxy.h
index 973c55f..d1c9c6b 100644
--- a/libs/hwui/SkiaCanvasProxy.h
+++ b/libs/hwui/SkiaCanvasProxy.h
@@ -44,7 +44,7 @@
 
 protected:
 
-    virtual SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) override;
+    virtual sk_sp<SkSurface> onNewSurface(const SkImageInfo&, const SkSurfaceProps&) override;
 
     virtual void willSave() override;
     virtual SaveLayerStrategy getSaveLayerStrategy(const SaveLayerRec&) override;