From fd92ee4b731bee39f8b100cd138fb491de9d66ee Mon Sep 17 00:00:00 2001
From: Yuqian Li <liyuqian@google.com>
Date: Wed, 27 Apr 2016 17:03:38 -0400
Subject: [PATCH] Remove SkTLazy

Change-Id: Ibce5cea66fe67fceb994ff45c9afb527dbaf641b
---
 libs/hwui/SkiaCanvas.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/libs/hwui/SkiaCanvas.cpp b/libs/hwui/SkiaCanvas.cpp
index ce67554645d13..1dfaa17f15e54 100644
--- a/libs/hwui/SkiaCanvas.cpp
+++ b/libs/hwui/SkiaCanvas.cpp
@@ -29,7 +29,6 @@
 #include <SkImage.h>
 #include <SkShader.h>
 #include <SkTArray.h>
-#include <SkTLazy.h>
 #include <SkTemplates.h>
 
 #include "VectorDrawable.h"
@@ -352,13 +351,12 @@ int SkiaCanvas::saveLayer(float left, float top, float right, float bottom,
 
 int SkiaCanvas::saveLayerAlpha(float left, float top, float right, float bottom,
         int alpha, SaveFlags::Flags flags) {
-    SkTLazy<SkPaint> alphaPaint;
     if (static_cast<unsigned>(alpha) < 0xFF) {
-        alphaPaint.init()->setAlpha(alpha);
+        SkPaint alphaPaint;
+        alphaPaint.setAlpha(alpha);
+        return this->saveLayer(left, top, right, bottom, &alphaPaint, flags);
     }
-
-    return this->saveLayer(left, top, right, bottom, alphaPaint.getMaybeNull(),
-                           flags);
+    return this->saveLayer(left, top, right, bottom, nullptr, flags);
 }
 
 // ----------------------------------------------------------------------------