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/RenderProperties.cpp

diff --git a/libs/hwui/RenderProperties.cpp b/libs/hwui/RenderProperties.cpp
index b0114bc..146fbe7 100644
--- a/libs/hwui/RenderProperties.cpp
+++ b/libs/hwui/RenderProperties.cpp
@@ -52,7 +52,7 @@
 bool LayerProperties::setFromPaint(const SkPaint* paint) {
     bool changed = false;
     changed |= setAlpha(static_cast<uint8_t>(PaintUtils::getAlphaDirect(paint)));
-    changed |= setXferMode(PaintUtils::getXfermodeDirect(paint));
+    changed |= setXferMode(PaintUtils::getBlendModeDirect(paint));
     changed |= setColorFilter(paint ? paint->getColorFilter() : nullptr);
     return changed;
 }