Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / include / core / SkImageInfo.h

diff --git a/src/third_party/skia/include/core/SkImageInfo.h b/src/third_party/skia/include/core/SkImageInfo.h
index b955433..3d82dc8 100644 (file)
--- a/src/third_party/skia/include/core/SkImageInfo.h
+++ b/src/third_party/skia/include/core/SkImageInfo.h
@@ -67,6 +67,10 @@ static inline bool SkAlphaTypeIsValid(unsigned value) {
 
 /**
  *  Describes how to interpret the components of a pixel.
+ *
+ *  kN32_SkColorType is an alias for whichever 32bit ARGB format is the "native"
+ *  form for skia's blitters. Use this if you don't have a swizzle preference
+ *  for 32bit pixels.
  */
 enum SkColorType {
     kUnknown_SkColorType,
@@ -120,6 +124,15 @@ static inline bool SkColorTypeIsValid(unsigned value) {
 ///////////////////////////////////////////////////////////////////////////////
 
 /**
+ *  Return true if alphaType is supported by colorType. If there is a canonical
+ *  alphaType for this colorType, return it in canonical.
+ */
+bool SkColorTypeValidateAlphaType(SkColorType colorType, SkAlphaType alphaType,
+                                  SkAlphaType* canonical = NULL);
+
+///////////////////////////////////////////////////////////////////////////////
+
+/**
  *  Describe an image's dimensions and pixel type.
  */
 struct SkImageInfo {