store SkAlphaType inside SkBitmap, on road to support unpremul

tests/ShaderOpacityTest.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Test.h"
 #include "SkShader.h"
 #include "SkGradientShader.h"
@@ skipping 14 matching lines @@
     bmp.allocPixels();
 
     // test 2: not opaque by default
     shader = SkShader::CreateBitmapShader(bmp,
         SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);
     REPORTER_ASSERT(reporter, shader);
     REPORTER_ASSERT(reporter, !shader->isOpaque());
     shader->unref();
 
     // test 3: explicitly opaque
-    bmp.setIsOpaque(true);
+    bmp.setAlphaType(kOpaque_SkAlphaType);
     shader = SkShader::CreateBitmapShader(bmp,
         SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);
     REPORTER_ASSERT(reporter, shader);
     REPORTER_ASSERT(reporter, shader->isOpaque());
     shader->unref();
 
     // test 4: explicitly not opaque
-    bmp.setIsOpaque(false);
+    bmp.setAlphaType(kPremul_SkAlphaType);
     shader = SkShader::CreateBitmapShader(bmp,
         SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);
     REPORTER_ASSERT(reporter, shader);
     REPORTER_ASSERT(reporter, !shader->isOpaque());
     shader->unref();
 
 }
 
 static void test_gradient(skiatest::Reporter* reporter)
 {
@@ skipping 56 matching lines @@
 
 static void test_shader_opacity(skiatest::Reporter* reporter)
 {
     test_gradient(reporter);
     test_color(reporter);
     test_bitmap(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("ShaderOpacity", ShaderOpacityTestClass, test_shader_opacity)