From 3354969a4a4adcea159f3a0b01ad0a7c04fc9115 Mon Sep 17 00:00:00 2001
From: Mike Klein <mtklein@chromium.org>
Date: Mon, 1 May 2017 21:31:32 +0000
Subject: Revert "SaveLayerRec::fClipMask -> raw pointer"

This reverts commit a6b72cb5729306fdd676d739c1e2c53afa0786a7.

Reason for revert: red bots

Original change's description:
> SaveLayerRec::fClipMask -> raw pointer
>
> Use raw pointers for optional clip mask plumbing, to match the backdrop
> API.
>
> Change-Id: I7eb0ee5896faf34cc05789ba0703f35a4ab6a4f2
> Reviewed-on: https://skia-review.googlesource.com/14901
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Florin Malita <fmalita@chromium.org>
>

TBR=fmalita@chromium.org,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: I4387620cdc3410018af9cef221e5cf8d09015380
Reviewed-on: https://skia-review.googlesource.com/14955
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
---
 gm/savelayer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gm/savelayer.cpp')

diff --git a/gm/savelayer.cpp b/gm/savelayer.cpp
index dd7ff7b54e..245785e951 100644
--- a/gm/savelayer.cpp
+++ b/gm/savelayer.cpp
@@ -210,8 +210,8 @@ DEF_SIMPLE_GM(savelayer_clipmask, canvas, 1200, 1200) {
         rec.fPaint = &layerPaint;
 
         for (const auto& maskMaker : kMaskMakers) {
-            sk_sp<SkImage> mask = maskMaker(kSize);
-            rec.fClipMask = mask.get();
+            maskMaker(kSize);
+            rec.fClipMask = maskMaker(kSize);
 
             canvas->save();
             for (const auto cfg : kConfigs) {
-- 
cgit v1.2.3