store SkAlphaType inside SkBitmap, on road to support unpremul

tests/BitmapCopyTest.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 "SkBitmap.h"
 #include "SkRect.h"
@@ skipping 292 matching lines @@
                     REPORTER_ASSERT(reporter, srcPremul.getGenerationID() == dst.getGenerationID());
                 } else {
                     REPORTER_ASSERT(reporter, srcPremul.getGenerationID() != dst.getGenerationID());
                 }
                 // test extractSubset
                 {
                     SkBitmap bitmap(srcOpaque);
                     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);
                         REPORTER_ASSERT(reporter, subset.height() == 1);
                         REPORTER_ASSERT(reporter,
                                         subset.isOpaque() == bitmap.isOpaque());
                         REPORTER_ASSERT(reporter,
                                         subset.isVolatile() == true);
 
                         SkBitmap copy;
                         REPORTER_ASSERT(reporter,
                                         subset.copyTo(&copy, subset.config()));
                         REPORTER_ASSERT(reporter, copy.width() == 1);
                         REPORTER_ASSERT(reporter, copy.height() == 1);
                         REPORTER_ASSERT(reporter, copy.rowBytes() <= 4);
 
                         SkAutoLockPixels alp0(subset);
                         SkAutoLockPixels alp1(copy);
                         // they should both have, or both not-have, a colortable
                         bool hasCT = subset.getColorTable() != NULL;
                         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,
                                         subset.isOpaque() == bitmap.isOpaque());
                         REPORTER_ASSERT(reporter,
                                         subset.isVolatile() == false);
                     }
                 }
             } else {
                 // dst should be unchanged from its initial state
@@ skipping 247 matching lines @@
                         false);
 
 #endif
             }
         } // for (size_t copyCase ...
     }
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("BitmapCopy", TestBitmapCopyClass, TestBitmapCopy)