commit 260ab726486317496bc12a57d599ea96dcde3284
author Mike Reed <reed@google.com> Fri Oct 07 15:59:20 2016 -0400
committer Mike Reed <reed@google.com> Thu Oct 13 17:14:52 2016 -0400
tree be150530fd0597507dddf3a670f2480563dd1e00
parent ccbc5c183067ae988f57725cfafda855bafa47ec

use SkBlendMode instead of SkXfermode
use sk_sp versions of paint setters/getters

Change-Id: I86591a0a8ec92e6039776cbf00424ea24f585b28

libs/hwui/VectorDrawable.cpp

diff --git a/libs/hwui/VectorDrawable.cpp b/libs/hwui/VectorDrawable.cpp
index a2f3cb6..715681d 100644
--- a/libs/hwui/VectorDrawable.cpp
+++ b/libs/hwui/VectorDrawable.cpp
@@ -201,10 +201,7 @@
     SkPaint paint;
     if (properties.getFillGradient() != nullptr) {
         paint.setColor(applyAlpha(SK_ColorBLACK, properties.getFillAlpha()));
-        SkShader* newShader = properties.getFillGradient()->newWithLocalMatrix(matrix);
-        // newWithLocalMatrix(...) creates a new SkShader and returns a bare pointer. We need to
-        // remove the extra ref so that the ref count is correctly managed.
-        paint.setShader(newShader)->unref();
+        paint.setShader(properties.getFillGradient()->makeWithLocalMatrix(matrix));
         needsFill = true;
     } else if (properties.getFillColor() != SK_ColorTRANSPARENT) {
         paint.setColor(applyAlpha(properties.getFillColor(), properties.getFillAlpha()));
@@ -223,10 +220,7 @@
     bool needsStroke = false;
     if (properties.getStrokeGradient() != nullptr) {
         paint.setColor(applyAlpha(SK_ColorBLACK, properties.getStrokeAlpha()));
-        SkShader* newShader = properties.getStrokeGradient()->newWithLocalMatrix(matrix);
-        // newWithLocalMatrix(...) creates a new SkShader and returns a bare pointer. We need to
-        // remove the extra ref so that the ref count is correctly managed.
-        paint.setShader(newShader)->unref();
+        paint.setShader(properties.getStrokeGradient()->makeWithLocalMatrix(matrix));
         needsStroke = true;
     } else if (properties.getStrokeColor() != SK_ColorTRANSPARENT) {
         paint.setColor(applyAlpha(properties.getStrokeColor(), properties.getStrokeAlpha()));
@@ -534,7 +528,7 @@
     if (prop->getRootAlpha() == 1.0f && prop->getColorFilter() == nullptr) {
         return nullptr;
     } else {
-        outPaint->setColorFilter(prop->getColorFilter());
+        outPaint->setColorFilter(sk_ref_sp(prop->getColorFilter()));
         outPaint->setFilterQuality(kLow_SkFilterQuality);
         outPaint->setAlpha(prop->getRootAlpha() * 255);
         return outPaint;