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/Layer.h

diff --git a/libs/hwui/Layer.h b/libs/hwui/Layer.h
index 01650ef..9874ce2 100644
--- a/libs/hwui/Layer.h
+++ b/libs/hwui/Layer.h
@@ -28,7 +28,7 @@
 #include <ui/Region.h>
 
 #include <SkPaint.h>
-#include <SkXfermode.h>
+#include <SkBlendMode.h>
 
 #include "Matrix.h"
 #include "Rect.h"
@@ -98,7 +98,7 @@
         this->alpha = alpha;
     }
 
-    inline void setAlpha(int alpha, SkXfermode::Mode mode) {
+    inline void setAlpha(int alpha, SkBlendMode mode) {
         this->alpha = alpha;
         this->mode = mode;
     }
@@ -107,7 +107,7 @@
         return alpha;
     }
 
-    inline SkXfermode::Mode getMode() const {
+    inline SkBlendMode getMode() const {
         return mode;
     }
 
@@ -208,7 +208,7 @@
     /**
      * Blending mode of the layer.
      */
-    SkXfermode::Mode mode = SkXfermode::kSrcOver_Mode;
+    SkBlendMode mode = SkBlendMode::kSrcOver;
 
     /**
      * Optional texture coordinates transform.