commit 2bd8b8100529c96c81c30f749f672f4caf775b04
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Nov 01 13:46:54 2013 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Nov 01 13:46:54 2013 +0000
tree 5a7468a4570ecf07a7089afbfbfeebb5c773555c
parent 05d56ebbf385c8723c9bed3409739055afa3b073

move SkImage::ColorType into SkColorType

objective -- move clients over to SkImage

tasks
- use SkImageInfo instead of SkBitmap::Config
- add support for colortables to SkImage
- add drawImage to SkCanvas
- return SkImage from readPixels

This CL works towards the first task

R=robertphillips@google.com

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

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

tests/DeferredCanvasTest.cpp

diff --git a/tests/DeferredCanvasTest.cpp b/tests/DeferredCanvasTest.cpp
index 537a810..a9679a3 100644
--- a/tests/DeferredCanvasTest.cpp
+++ b/tests/DeferredCanvasTest.cpp
@@ -57,7 +57,7 @@
         return SkNEW_ARGS(SkCanvas, (fBitmap));
     }
 
-    virtual SkSurface* onNewSurface(const SkImage::Info&) SK_OVERRIDE {
+    virtual SkSurface* onNewSurface(const SkImageInfo&) SK_OVERRIDE {
         return NULL;
     }
 
@@ -692,10 +692,10 @@
 }
 
 static void TestDeferredCanvasSurface(skiatest::Reporter* reporter, GrContextFactory* factory) {
-    SkImage::Info imageSpec = {
+    SkImageInfo imageSpec = {
         10,  // width
         10,  // height
-        SkImage::kPMColor_ColorType,
+        kPMColor_SkColorType,
         kPremul_SkAlphaType
     };
     SkSurface* surface;
@@ -759,10 +759,10 @@
 }
 
 static void TestDeferredCanvasSetSurface(skiatest::Reporter* reporter, GrContextFactory* factory) {
-    SkImage::Info imageSpec = {
+    SkImageInfo imageSpec = {
         10,  // width
         10,  // height
-        SkImage::kPMColor_ColorType,
+        kPMColor_SkColorType,
         kPremul_SkAlphaType
     };
     SkSurface* surface;