Adjust the alpha type for pixelRefs.

include/core/SkImageInfo.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkImageInfo_DEFINED
 #define SkImageInfo_DEFINED
 
@@ skipping 102 matching lines @@
     return width * SkColorTypeBytesPerPixel(ct);
 }
 
 static inline bool SkColorTypeIsValid(unsigned value) {
     return value <= kLastEnum_SkColorType;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 /**
+ *  Return true if alphaType is supported by colorType. If there is a canonical

[scroggo, 2014/06/18 17:45:43]

Let me know if you think there is a better way to express this. It appears we
only return false if someone paired kIgnore_SkAlphaType (which may be going
away, IIUC?) with a valid SkColorType, or if they used an invalid SkColorType.

[reed1, 2014/06/18 17:58:20]

Good question. It would be prettier if this guy just returned a (new) alphatype.
For now leave it this way I guess, but we should keep our eyes open for the
chance to change it.

+ *  alphaType for this colorType, return it in canonical.
+ */
+bool SkValidateAlphaType(SkColorType colorType, SkAlphaType alphaType,

[reed1, 2014/06/18 17:58:20]

Wonder if the the name should start with colortype or alphatype, as the others
do...

SkColorTypeValidateAlphaType(ct, at, *at) ?

[scroggo, 2014/06/30 22:03:58]

Done.

+                         SkAlphaType* canonical = NULL);
+
+///////////////////////////////////////////////////////////////////////////////
+
+/**
  *  Describe an image's dimensions and pixel type.
  */
 struct SkImageInfo {
     int         fWidth;
     int         fHeight;
     SkColorType fColorType;
     SkAlphaType fAlphaType;
 
     static SkImageInfo Make(int width, int height, SkColorType ct, SkAlphaType at) {
         SkImageInfo info = {
@@ skipping 106 matching lines @@
 
     bool validRowBytes(size_t rowBytes) const {
         uint64_t rb = sk_64_mul(fWidth, this->bytesPerPixel());
         return rowBytes >= rb;
     }
 
     SkDEBUGCODE(void validate() const;)
 };
 
 #endif