commit 048522dd2aa45d1b4bf52944527f877b30ea45fd
author reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jun 23 12:19:41 2009 +0000
committer reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jun 23 12:19:41 2009 +0000
tree 4547ff538ea7af3d1c5c711459520fd4f5c83929
parent 845fdaca174f4675e9acc164b510e3a5ffa9053c

remove remaining references to porterduff



git-svn-id: http://skia.googlecode.com/svn/trunk@236 2bbb7eff-a529-9590-31e7-b0007b416f81

samplecode/SampleLayers.cpp

diff --git a/samplecode/SampleLayers.cpp b/samplecode/SampleLayers.cpp
index e6867bb..5a52d0e 100644
--- a/samplecode/SampleLayers.cpp
+++ b/samplecode/SampleLayers.cpp
@@ -17,7 +17,6 @@
 #include "SkTypeface.h"
 #include "SkUtils.h"
 #include "SkKey.h"
-#include "SkPorterDuff.h"
 #include "SkXfermode.h"
 #include "SkDrawFilter.h"
 
@@ -27,7 +26,7 @@
     SkShader* s = SkGradientShader::CreateLinear(pts, colors, NULL, 2, SkShader::kClamp_TileMode);
     
     paint->setShader(s)->unref();
-    paint->setXfermode(SkPorterDuff::CreateXfermode(SkPorterDuff::kDstIn_Mode))->unref();
+    paint->setXfermode(SkXfermode::kDstIn_Mode);
 }
 
 static void dump_layers(const char label[], SkCanvas* canvas) {
@@ -163,7 +162,7 @@
             canvas->saveLayer(&r, &p);
             canvas->drawColor(0xFFFF0000);
             p.setAlpha(1);  // or 0
-            p.setPorterDuffXfermode(SkPorterDuff::kSrc_Mode);
+            p.setXfermode(SkXfermode::kSrc_Mode);
             canvas->drawOval(r, p);
             canvas->restore();
             return;
@@ -240,7 +239,7 @@
         canvas->drawOval(r, p);
         
         p.setAlpha(0x80);
-        p.setPorterDuffXfermode(SkPorterDuff::kDstIn_Mode);
+        p.setXfermode(SkXfermode::kDstIn_Mode);
         canvas->drawRect(bounds, p);
 
         canvas->restore();