Fix Skia merge by fixing API mismatch.

Test: compile
Change-Id: Ie524af03fd3c85cceac13abdcdd9af8ef6ca6bb9

3 files changed, 6 insertions, 6 deletions

diff --git a/libs/hwui/VkLayer.cpp b/libs/hwui/VkLayer.cpp
index 391acf13acd0..537b3eaa3ad5 100644
--- a/libs/hwui/VkLayer.cpp
+++ b/libs/hwui/VkLayer.cpp
@@ -29,7 +29,7 @@ void VkLayer::updateTexture() {
     SkImageInfo info = SkImageInfo::MakeS32(mWidth, mHeight, kPremul_SkAlphaType);
     surface = SkSurface::MakeRenderTarget(mRenderState.getGrContext(), SkBudgeted::kNo, info);
     surface->getCanvas()->clear(SK_ColorBLUE);
-    mImage = surface->makeImageSnapshot(SkBudgeted::kNo, SkSurface::kNo_ForceUnique);
+    mImage = surface->makeImageSnapshot(SkBudgeted::kNo);
 }
 
 void VkLayer::onVkContextDestroyed() {
diff --git a/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp b/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp
index 0906cc84ab7a..f5ff05849793 100644
--- a/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp
+++ b/libs/hwui/tests/unit/RenderNodeDrawableTests.cpp
@@ -392,7 +392,7 @@ RENDERTHREAD_TEST(RenderNodeDrawable, projectionHwLayer) {
         sk_sp<SkSurface> onNewSurface(const SkImageInfo&) override {
             return sk_sp<SkSurface>();
         }
-        sk_sp<SkImage> onNewImageSnapshot(SkBudgeted, SkCopyPixelsMode) override {
+        sk_sp<SkImage> onNewImageSnapshot(SkBudgeted) override {
             return sk_sp<SkImage>();
         }
         void onCopyOnWrite(ContentChangeMode) override {}
diff --git a/libs/hwui/tests/unit/SkiaPipelineTests.cpp b/libs/hwui/tests/unit/SkiaPipelineTests.cpp
index f3a663e802da..494585a22069 100644
--- a/libs/hwui/tests/unit/SkiaPipelineTests.cpp
+++ b/libs/hwui/tests/unit/SkiaPipelineTests.cpp
@@ -201,16 +201,16 @@ namespace {
 template <typename T>
 class DeferLayer : public SkSurface_Base {
 public:
-    DeferLayer()
-        : SkSurface_Base(T().imageInfo(), nullptr) {
-    }
+    DeferLayer() : SkSurface_Base(T().imageInfo(), nullptr) {}
+    virtual ~DeferLayer() {}
+
     SkCanvas* onNewCanvas() override {
         return new T();
     }
     sk_sp<SkSurface> onNewSurface(const SkImageInfo&) override {
         return sk_sp<SkSurface>();
     }
-    sk_sp<SkImage> onNewImageSnapshot(SkBudgeted, SkCopyPixelsMode) override {
+    sk_sp<SkImage> onNewImageSnapshot(SkBudgeted) override {
         return sk_sp<SkImage>();
     }
     T* canvas() { return static_cast<T*>(getCanvas()); }