store SkAlphaType inside SkBitmap, on road to support unpremul

tests/BitmapCopyTest.cpp

Index: tests/BitmapCopyTest.cpp
diff --git a/tests/BitmapCopyTest.cpp b/tests/BitmapCopyTest.cpp
index cccde8af92eb56ba95b90a78a45463f9d197f303..382fc16180422b5dbbda24e41dd41aef1597cff4 100644
--- a/tests/BitmapCopyTest.cpp
+++ b/tests/BitmapCopyTest.cpp
@@ -310,6 +310,10 @@ static void TestBitmapCopy(skiatest::Reporter* reporter) {
                     SkBitmap subset;
                     SkIRect r;
                     r.set(1, 1, 2, 2);
+<<<<<<< HEAD

[scroggo, 2013/10/18 19:32:40]

Needs merge.

+=======
+                    bitmap.setAlphaType(kOpaque_SkAlphaType);
+>>>>>>> store SkAlphaType inside SkBitmap, on road to support unpremul
                     bitmap.setIsVolatile(true);
                     if (bitmap.extractSubset(&subset, r)) {
                         REPORTER_ASSERT(reporter, subset.width() == 1);
@@ -333,8 +337,12 @@ static void TestBitmapCopy(skiatest::Reporter* reporter) {
                         REPORTER_ASSERT(reporter,
                                     (copy.getColorTable() != NULL) == hasCT);
                     }
+<<<<<<< HEAD
 
                     bitmap = srcPremul;
+=======
+                    bitmap.setAlphaType(kPremul_SkAlphaType);
+>>>>>>> store SkAlphaType inside SkBitmap, on road to support unpremul
                     bitmap.setIsVolatile(false);
                     if (bitmap.extractSubset(&subset, r)) {
                         REPORTER_ASSERT(reporter,