From 0baf19375466cfc24c96532df406e7c5b1d1aae8 Mon Sep 17 00:00:00 2001 From: "reed@android.com" Date: Wed, 24 Jun 2009 12:41:42 +0000 Subject: detect nearly translate-only matrices when drawing bitmaps (for speed) rename setXfermode(Mode) to setXfermodeMode(Mode) for sanity fix memory leak in setXfermode(Mode) git-svn-id: http://skia.googlecode.com/svn/trunk@239 2bbb7eff-a529-9590-31e7-b0007b416f81 --- samplecode/SampleAll.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'samplecode/SampleAll.cpp') diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index c80ee432a8..7e83dec6d1 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -84,7 +84,7 @@ static void r0(SkLayerRasterizer* rast, SkPaint& p) p.setAlpha(0x11); p.setStyle(SkPaint::kFill_Style); - p.setXfermode(SkXfermode::kSrc_Mode); + p.setXfermodeMode(SkXfermode::kSrc_Mode); rast->addLayer(p); } @@ -93,7 +93,7 @@ static void r1(SkLayerRasterizer* rast, SkPaint& p) rast->addLayer(p); p.setAlpha(0x40); - p.setXfermode(SkXfermode::kSrc_Mode); + p.setXfermodeMode(SkXfermode::kSrc_Mode); p.setStyle(SkPaint::kStroke_Style); p.setStrokeWidth(SK_Scalar1*2); rast->addLayer(p); @@ -107,7 +107,7 @@ static void r2(SkLayerRasterizer* rast, SkPaint& p) p.setStyle(SkPaint::kStroke_Style); p.setStrokeWidth(SK_Scalar1*3/2); - p.setXfermode(SkXfermode::kClear_Mode); + p.setXfermodeMode(SkXfermode::kClear_Mode); rast->addLayer(p); } @@ -119,7 +119,7 @@ static void r3(SkLayerRasterizer* rast, SkPaint& p) p.setAlpha(0x20); p.setStyle(SkPaint::kFill_Style); - p.setXfermode(SkXfermode::kSrc_Mode); + p.setXfermodeMode(SkXfermode::kSrc_Mode); rast->addLayer(p); } @@ -129,7 +129,7 @@ static void r4(SkLayerRasterizer* rast, SkPaint& p) rast->addLayer(p, SkIntToScalar(3), SkIntToScalar(3)); p.setAlpha(0xFF); - p.setXfermode(SkXfermode::kClear_Mode); + p.setXfermodeMode(SkXfermode::kClear_Mode); rast->addLayer(p, SK_Scalar1*3/2, SK_Scalar1*3/2); p.setXfermode(NULL); @@ -141,7 +141,7 @@ static void r5(SkLayerRasterizer* rast, SkPaint& p) rast->addLayer(p); p.setPathEffect(new SkDiscretePathEffect(SK_Scalar1*4, SK_Scalar1*3))->unref(); - p.setXfermode(SkXfermode::kSrcOut_Mode); + p.setXfermodeMode(SkXfermode::kSrcOut_Mode); rast->addLayer(p); } @@ -153,7 +153,7 @@ static void r6(SkLayerRasterizer* rast, SkPaint& p) SkLayerRasterizer* rast2 = new SkLayerRasterizer; r5(rast2, p); p.setRasterizer(rast2)->unref(); - p.setXfermode(SkXfermode::kClear_Mode); + p.setXfermodeMode(SkXfermode::kClear_Mode); rast->addLayer(p); } @@ -208,7 +208,7 @@ static void r8(SkLayerRasterizer* rast, SkPaint& p) lattice.setScale(SK_Scalar1*6, SK_Scalar1*6, 0, 0); lattice.postSkew(SK_Scalar1/3, 0, 0, 0); p.setPathEffect(new Dot2DPathEffect(SK_Scalar1*2, lattice))->unref(); - p.setXfermode(SkXfermode::kClear_Mode); + p.setXfermodeMode(SkXfermode::kClear_Mode); rast->addLayer(p); p.setPathEffect(NULL); @@ -278,7 +278,7 @@ static void r9(SkLayerRasterizer* rast, SkPaint& p) lattice.setScale(SK_Scalar1, SK_Scalar1*6, 0, 0); lattice.postRotate(SkIntToScalar(30), 0, 0); p.setPathEffect(new Line2DPathEffect(SK_Scalar1*2, lattice))->unref(); - p.setXfermode(SkXfermode::kClear_Mode); + p.setXfermodeMode(SkXfermode::kClear_Mode); rast->addLayer(p); p.setPathEffect(NULL); -- cgit v1.2.3