Revert "Revert of https://codereview.chromium.org/129423002/"

fixed new api references in unit tests

This reverts commit ffc0058e1fbcbd69617e1f41b2dce5b5765ff99e.

BUG=

Review URL: https://codereview.chromium.org/132643007

git-svn-id: http://skia.googlecode.com/svn/trunk@13057 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 54 insertions, 0 deletions

diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h
index 1165479f74..e0bce2a7c0 100644
--- a/include/core/SkImageInfo.h
+++ b/include/core/SkImageInfo.h
@@ -109,6 +109,60 @@ struct SkImageInfo {
     SkColorType fColorType;
     SkAlphaType fAlphaType;
 
+    static SkImageInfo Make(int width, int height, SkColorType ct, SkAlphaType at) {
+        SkASSERT(width >= 0);
+        SkASSERT(height >= 0);
+        SkImageInfo info = {
+            width, height, ct, at
+        };
+        return info;
+    }
+
+    /**
+     *  Sets colortype to the native ARGB32 type.
+     */
+    static SkImageInfo MakeN32(int width, int height, SkAlphaType at) {
+        SkASSERT(width >= 0);
+        SkASSERT(height >= 0);
+        SkImageInfo info = {
+            width, height, kPMColor_SkColorType, at
+        };
+        return info;
+    }
+
+    /**
+     *  Sets colortype to the native ARGB32 type, and the alphatype to premul.
+     */
+    static SkImageInfo MakeN32Premul(int width, int height) {
+        SkASSERT(width >= 0);
+        SkASSERT(height >= 0);
+        SkImageInfo info = {
+            width, height, kPMColor_SkColorType, kPremul_SkAlphaType
+        };
+        return info;
+    }
+
+    /**
+     *  Sets colortype to the native ARGB32 type, and the alphatype to opaque.
+     */
+    static SkImageInfo MakeN32Opaque(int width, int height) {
+        SkASSERT(width >= 0);
+        SkASSERT(height >= 0);
+        SkImageInfo info = {
+            width, height, kPMColor_SkColorType, kOpaque_SkAlphaType
+        };
+        return info;
+    }
+    
+    static SkImageInfo MakeA8(int width, int height) {
+        SkASSERT(width >= 0);
+        SkASSERT(height >= 0);
+        SkImageInfo info = {
+            width, height, kAlpha_8_SkColorType, kPremul_SkAlphaType
+        };
+        return info;
+    }
+    
     bool isOpaque() const {
         return SkAlphaTypeIsOpaque(fAlphaType);
     }