Defining new color constat for transparent color
Review URL: https://codereview.appspot.com/6901044
git-svn-id: http://skia.googlecode.com/svn/trunk@6696 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 0943d77..cc06e04 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -468,7 +468,7 @@
SkBitmap bm;
bm.setConfig(SkBitmap::kA8_Config, 64, 64);
bm.allocPixels();
- bm.eraseColor(0);
+ bm.eraseColor(SK_ColorTRANSPARENT);
SkCanvas canvas(bm);
diff --git a/samplecode/SampleColorFilter.cpp b/samplecode/SampleColorFilter.cpp
index bbabea2..e57ccb0 100644
--- a/samplecode/SampleColorFilter.cpp
+++ b/samplecode/SampleColorFilter.cpp
@@ -101,7 +101,7 @@
SkBitmap bitmap;
bitmap.setConfig(SkBitmap::kARGB_8888_Config, n, n);
bitmap.allocPixels();
- bitmap.eraseColor(0);
+ bitmap.eraseColor(SK_ColorTRANSPARENT);
SkCanvas canvas(bitmap);
SkRect r;
diff --git a/samplecode/SampleDither.cpp b/samplecode/SampleDither.cpp
index 7e5fc21..259bc94 100644
--- a/samplecode/SampleDither.cpp
+++ b/samplecode/SampleDither.cpp
@@ -76,7 +76,7 @@
bm->eraseColor(SK_ColorBLUE);
return;
#else
- bm->eraseColor(0);
+ bm->eraseColor(SK_ColorTRANSPARENT);
#endif
SkCanvas c(*bm);
diff --git a/samplecode/SampleFatBits.cpp b/samplecode/SampleFatBits.cpp
index eac7136..3641ec9 100644
--- a/samplecode/SampleFatBits.cpp
+++ b/samplecode/SampleFatBits.cpp
@@ -21,7 +21,7 @@
#define WIRE_FRAME_SIZE 1.5f
static void erase(SkSurface* surface) {
- surface->getCanvas()->clear(0);
+ surface->getCanvas()->clear(SK_ColorTRANSPARENT);
}
static SkShader* createChecker() {
diff --git a/samplecode/SampleHairline.cpp b/samplecode/SampleHairline.cpp
index 7aa4666..28ed68f 100644
--- a/samplecode/SampleHairline.cpp
+++ b/samplecode/SampleHairline.cpp
@@ -232,7 +232,7 @@
HEIGHT + MARGIN*2);
bm.allocPixels();
// this will erase our margin, which we want to always stay 0
- bm.eraseColor(0);
+ bm.eraseColor(SK_ColorTRANSPARENT);
bm2.setConfig(SkBitmap::kARGB_8888_Config, WIDTH, HEIGHT,
bm.rowBytes());
@@ -243,7 +243,7 @@
paint.setAntiAlias(fDoAA);
paint.setStyle(SkPaint::kStroke_Style);
- bm2.eraseColor(0);
+ bm2.eraseColor(SK_ColorTRANSPARENT);
gProcs[fProcIndex].fProc(&c2, paint, bm);
canvas->drawBitmap(bm2, SkIntToScalar(10), SkIntToScalar(10), NULL);
diff --git a/samplecode/SampleLayerMask.cpp b/samplecode/SampleLayerMask.cpp
index 78b9800..d65c131 100644
--- a/samplecode/SampleLayerMask.cpp
+++ b/samplecode/SampleLayerMask.cpp
@@ -38,7 +38,7 @@
int h = SkScalarRound(r.height());
mask.setConfig(SkBitmap::kARGB_8888_Config, w, h);
mask.allocPixels();
- mask.eraseColor(0);
+ mask.eraseColor(SK_ColorTRANSPARENT);
SkCanvas c(mask);
SkRect bounds = r;
bounds.offset(-bounds.fLeft, -bounds.fTop);
diff --git a/samplecode/SampleMipMap.cpp b/samplecode/SampleMipMap.cpp
index e0a8e4d..f3a12cd 100644
--- a/samplecode/SampleMipMap.cpp
+++ b/samplecode/SampleMipMap.cpp
@@ -16,7 +16,7 @@
SkBitmap bitmap;
bitmap.setConfig(SkBitmap::kARGB_8888_Config, n, n);
bitmap.allocPixels();
- bitmap.eraseColor(0);
+ bitmap.eraseColor(SK_ColorTRANSPARENT);
SkCanvas canvas(bitmap);
SkRect r;
@@ -83,7 +83,7 @@
SkAutoCanvasRestore acr(canvas, true);
for (int i = 0; i < 6; i++) {
- bg.eraseColor(0);
+ bg.eraseColor(SK_ColorTRANSPARENT);
SkCanvas c(bg);
c.scale(SK_Scalar1 / (1 << i), SK_Scalar1 / (1 << i));
c.drawBitmap(bitmap, 0, 0, NULL);
diff --git a/samplecode/SampleOvalTest.cpp b/samplecode/SampleOvalTest.cpp
index 340acf6..88b7d5f 100644
--- a/samplecode/SampleOvalTest.cpp
+++ b/samplecode/SampleOvalTest.cpp
@@ -45,7 +45,7 @@
SkCanvas canvas(fBitmap);
SkPaint p;
- fBitmap.eraseColor(0);
+ fBitmap.eraseColor(SK_ColorTRANSPARENT);
canvas.drawOval(SkRect::MakeSize(fSize), p);
}
diff --git a/samplecode/SamplePageFlip.cpp b/samplecode/SamplePageFlip.cpp
index 7daeb1b..1020189 100644
--- a/samplecode/SamplePageFlip.cpp
+++ b/samplecode/SamplePageFlip.cpp
@@ -120,7 +120,7 @@
fBitmaps[i].setConfig(gConfigs[i], WIDTH, HEIGHT);
SkFlipPixelRef* pr = new SkFlipPixelRef(gConfigs[i], WIDTH, HEIGHT);
fBitmaps[i].setPixelRef(pr)->unref();
- fBitmaps[i].eraseColor(0);
+ fBitmaps[i].eraseColor(SK_ColorTRANSPARENT);
status = pthread_create(&fThreads[i], &attr, draw_proc, &fBitmaps[i]);
SkASSERT(0 == status);
diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp
index 269fc6a..8b3a03c 100644
--- a/samplecode/SampleRegion.cpp
+++ b/samplecode/SampleRegion.cpp
@@ -22,7 +22,7 @@
SkBitmap bitmap;
bitmap.setConfig(SkBitmap::kA8_Config, width*2, height*2);
bitmap.allocPixels();
- bitmap.eraseColor(0);
+ bitmap.eraseColor(SK_ColorTRANSPARENT);
SkScalar dx = 20;
SkScalar dy = 20;
@@ -41,12 +41,12 @@
paint.setStrokeWidth(1);
// use the rect
- c.clear(0);
+ c.clear(SK_ColorTRANSPARENT);
c.drawRect(r, paint);
canvas->drawBitmap(bitmap, 0, 0, NULL);
// use the path
- c.clear(0);
+ c.clear(SK_ColorTRANSPARENT);
c.drawPath(path, paint);
canvas->drawBitmap(bitmap, SkIntToScalar(2*width), 0, NULL);
}
diff --git a/samplecode/SampleShaderText.cpp b/samplecode/SampleShaderText.cpp
index cada977..a83b099 100644
--- a/samplecode/SampleShaderText.cpp
+++ b/samplecode/SampleShaderText.cpp
@@ -14,7 +14,7 @@
static void makebm(SkBitmap* bm, SkBitmap::Config config, int w, int h) {
bm->setConfig(config, w, h);
bm->allocPixels();
- bm->eraseColor(0);
+ bm->eraseColor(SK_ColorTRANSPARENT);
SkCanvas canvas(*bm);
SkScalar s = SkIntToScalar(w < h ? w : h);
diff --git a/samplecode/SampleStrokeText.cpp b/samplecode/SampleStrokeText.cpp
index 8245f4e..4ceb0d5 100644
--- a/samplecode/SampleStrokeText.cpp
+++ b/samplecode/SampleStrokeText.cpp
@@ -48,7 +48,7 @@
SkBitmap src;
src.setConfig(config, w, h);
src.allocPixels();
- src.eraseColor(0);
+ src.eraseColor(SK_ColorTRANSPARENT);
{
SkCanvas canvas(src);
paint.setAntiAlias(true);
diff --git a/samplecode/SampleTiling.cpp b/samplecode/SampleTiling.cpp
index e7b6a7f..59e88ea 100644
--- a/samplecode/SampleTiling.cpp
+++ b/samplecode/SampleTiling.cpp
@@ -26,7 +26,7 @@
static void makebm(SkBitmap* bm, SkBitmap::Config config, int w, int h) {
bm->setConfig(config, w, h);
bm->allocPixels();
- bm->eraseColor(0);
+ bm->eraseColor(SK_ColorTRANSPARENT);
SkCanvas canvas(*bm);
SkPoint pts[] = { { 0, 0 }, { SkIntToScalar(w), SkIntToScalar(h) } };