Change device factories to take SkImageInfo instead of SkBitmap::Config

tests/PremulAlphaRoundTripTest.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 "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkConfig8888.h"
@@ skipping 18 matching lines @@
     canvas->writePixels(bmp, 0, 0, unpremulConfig);
 }
 
 static const SkCanvas::Config8888 gUnpremulConfigs[] = {
     SkCanvas::kNative_Unpremul_Config8888,
     SkCanvas::kBGRA_Unpremul_Config8888,
     SkCanvas::kRGBA_Unpremul_Config8888,
 };
 
 DEF_GPUTEST(PremulAlphaRoundTrip, reporter, factory) {
+    const SkImageInfo info = SkImageInfo::MakeN32Premul(256, 256);
+
     SkAutoTUnref<SkBaseDevice> device;
     for (int dtype = 0; dtype < 2; ++dtype) {
 
         int glCtxTypeCnt = 1;
 #if SK_SUPPORT_GPU
         if (0 != dtype)  {
             glCtxTypeCnt = GrContextFactory::kGLContextTypeCnt;
         }
 #endif
         for (int glCtxType = 0; glCtxType < glCtxTypeCnt; ++glCtxType) {
             if (0 == dtype) {
-                device.reset(new SkBitmapDevice(SkBitmap::kARGB_8888_Config,
-                                                256,
-                                                256,
-                                                false));
+                device.reset(SkBitmapDevice::Create(info));
             } else {
 #if SK_SUPPORT_GPU
                 GrContextFactory::GLContextType type =
                     static_cast<GrContextFactory::GLContextType>(glCtxType);
                 if (!GrContextFactory::IsRenderingGLContext(type)) {
                     continue;
                 }
                 GrContext* context = factory->get(type);
                 if (NULL == context) {
                     continue;
                 }
 
-                device.reset(new SkGpuDevice(context, SkBitmap::kARGB_8888_Config, 256, 256));
+                device.reset(SkGpuDevice::Create(context, info, 0));
 #else
                 continue;
 #endif
             }
             SkCanvas canvas(device);
 
             SkBitmap readBmp1;
             readBmp1.allocN32Pixels(256, 256);
             SkBitmap readBmp2;
             readBmp2.allocN32Pixels(256, 256);
@@ skipping 23 matching lines @@
                 for (int y = 0; y < 256 && success; ++y) {
                     for (int x = 0; x < 256 && success; ++x) {
                         int i = y * 256 + x;
                         REPORTER_ASSERT(reporter, success = pixels1[i] == pixels2[i]);
                     }
                 }
             }
         }
     }
 }