commit 383a697692cf46951fd451f6f4c3d03634a6a1cb
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 21 14:00:07 2013 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 21 14:00:07 2013 +0000
tree a1dac6fe4fa0e4d34d032e70ff85503843ad39b8
parent c2eae4795478ab134a2315b1a9ff2c5de1d049e4

store SkAlphaType inside SkBitmap, on road to support unpremul

BUG=
R=bsalomon@google.com, scroggo@google.com

Review URL: https://codereview.chromium.org/25275004

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

bench/BitmapBench.cpp

diff --git a/bench/BitmapBench.cpp b/bench/BitmapBench.cpp
index 982c917..6dc7592 100644
--- a/bench/BitmapBench.cpp
+++ b/bench/BitmapBench.cpp
@@ -126,7 +126,7 @@
             fBitmap = bm;
         }
 
-        fBitmap.setIsOpaque(fIsOpaque);
+        fBitmap.setAlphaType(fIsOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
         fBitmap.setIsVolatile(fIsVolatile);
     }
 

bench/BitmapRectBench.cpp

diff --git a/bench/BitmapRectBench.cpp b/bench/BitmapRectBench.cpp
index 1dd98ef..104cb24 100644
--- a/bench/BitmapRectBench.cpp
+++ b/bench/BitmapRectBench.cpp
@@ -66,7 +66,7 @@
 
     virtual void onPreDraw() SK_OVERRIDE {
         fBitmap.allocPixels();
-        fBitmap.setIsOpaque(true);
+        fBitmap.setAlphaType(kOpaque_SkAlphaType);
         fBitmap.eraseColor(SK_ColorBLACK);
         draw_into_bitmap(fBitmap);
 

bench/BitmapScaleBench.cpp

diff --git a/bench/BitmapScaleBench.cpp b/bench/BitmapScaleBench.cpp
index cc2a33a..ae3df71 100644
--- a/bench/BitmapScaleBench.cpp
+++ b/bench/BitmapScaleBench.cpp
@@ -57,14 +57,14 @@
     }
 
     virtual void onPreDraw() {
-        fInputBitmap.setConfig(SkBitmap::kARGB_8888_Config, fInputSize, fInputSize);
+        fInputBitmap.setConfig(SkBitmap::kARGB_8888_Config,
+                               fInputSize, fInputSize, 0, kOpaque_SkAlphaType);
         fInputBitmap.allocPixels();
         fInputBitmap.eraseColor(SK_ColorWHITE);
-        fInputBitmap.setIsOpaque(true);
 
-        fOutputBitmap.setConfig(SkBitmap::kARGB_8888_Config, fOutputSize, fOutputSize);
+        fOutputBitmap.setConfig(SkBitmap::kARGB_8888_Config,
+                                fOutputSize, fOutputSize, 0, kOpaque_SkAlphaType);
         fOutputBitmap.allocPixels();
-        fOutputBitmap.setIsOpaque(true);
 
         fMatrix.setScale( scale(), scale() );
     }

bench/RepeatTileBench.cpp

diff --git a/bench/RepeatTileBench.cpp b/bench/RepeatTileBench.cpp
index 612a149..957ec2a 100644
--- a/bench/RepeatTileBench.cpp
+++ b/bench/RepeatTileBench.cpp
@@ -115,7 +115,8 @@
     virtual void onPreDraw() SK_OVERRIDE {
         fBitmap.allocPixels();
         fBitmap.eraseColor(fIsOpaque ? SK_ColorWHITE : 0);
-        fBitmap.setIsOpaque(fIsOpaque);
+        fBitmap.setAlphaType(fIsOpaque ?
+                             kOpaque_SkAlphaType : kPremul_SkAlphaType);
 
         draw_into_bitmap(fBitmap);
 

bench/TileBench.cpp

diff --git a/bench/TileBench.cpp b/bench/TileBench.cpp
index 60312a3..03a758c 100644
--- a/bench/TileBench.cpp
+++ b/bench/TileBench.cpp
@@ -48,11 +48,10 @@
         , fDoScale(doScale) {
         SkBitmap bm;
 
-        bm.setConfig(SkBitmap::kARGB_8888_Config, kWidth, kHeight);
-
+        bm.setConfig(SkBitmap::kARGB_8888_Config, kWidth, kHeight, 0,
+                     kOpaque_SkAlphaType);
         bm.allocPixels();
         bm.eraseColor(SK_ColorWHITE);
-        bm.setIsOpaque(true);
 
         create_gradient(&bm);