commit dbfac8a72393eaf01670aeb3244de0e18d8faf98
author junov@google.com <junov@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Dec 06 21:47:40 2012 +0000
committer junov@google.com <junov@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Dec 06 21:47:40 2012 +0000
tree 851b0b533bedd77e65dd43746802c4acf59b8390
parent 4eeda37a7456876cb8d509a4ea43c7f4c684477a

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

src/core/SkBitmap.cpp

diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 458cb61..9d51f9b 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -1023,7 +1023,7 @@
     } else {
         // if the src has alpha, we have to clear the dst first
         if (!src->isOpaque()) {
-            tmpDst.eraseColor(0);
+            tmpDst.eraseColor(SK_ColorTRANSPARENT);
         }
 
         SkCanvas canvas(tmpDst);

src/core/SkDevice.cpp

diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp
index 7da9a6b..56b1841 100644
--- a/src/core/SkDevice.cpp
+++ b/src/core/SkDevice.cpp
@@ -44,7 +44,7 @@
     fBitmap.allocPixels();
     fBitmap.setIsOpaque(isOpaque);
     if (!isOpaque) {
-        fBitmap.eraseColor(0);
+        fBitmap.eraseColor(SK_ColorTRANSPARENT);
     }
 }
 

src/core/SkScalerContext.h

diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h
index b637e84..05d5bc0 100644
--- a/src/core/SkScalerContext.h
+++ b/src/core/SkScalerContext.h
@@ -74,7 +74,7 @@
      *  paint and device gamma to be effectively 1.0.
      */
     void ignorePreBlend() {
-        setLuminanceColor(0x00000000);
+        setLuminanceColor(SK_ColorTRANSPARENT);
         setPaintGamma(SK_Scalar1);
         setDeviceGamma(SK_Scalar1);
         setContrast(0);