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

tests/GpuBitmapCopyTest.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #if SK_SUPPORT_GPU
 
@@ skipping 104 matching lines @@
         GrContext* grContext = factory->get(glType);
         if (NULL == grContext) {
             continue;
         }
 
 
         if (NULL == grContext) {
             return;
         }
         static const Pair gPairs[] = {
-            { SkBitmap::kNo_Config,         "00"  },
-            { SkBitmap::kARGB_8888_Config,  "01"  },
+            // SkGpuDevice can no longer be Create()ed with kNo_Config
+            // (or kUnknown_SkColorType in the new world), hence much of this
+            // test will be skipped, since it was checking that calling
+            // copyTo or deepCopyTo with src or dst set to kUnknown/kNo would
+            // successfully fail.
+            //
+            // If we can declare that you can *never* create a texture with
+            // kUnknown, then perhaps we can remove this entire test...
+            //
+//            { SkBitmap::kNo_Config,         "00"  },
+//            { SkBitmap::kARGB_8888_Config,  "01"  },
+            { SkBitmap::kARGB_8888_Config,  "1"  },
         };
 
         const int W = 20;
         const int H = 33;
 
         for (size_t i = 0; i < SK_ARRAY_COUNT(gPairs); i++) {
+            SkImageInfo info = SkImageInfo::Make(W, H,
+                                                 SkBitmapConfigToColorType(gPairs[i].fConfig),
+                                                 kPremul_SkAlphaType);
             SkBitmap src, dst;
 
-            SkGpuDevice* device = SkNEW_ARGS(SkGpuDevice, (grContext, gPairs[i].fConfig, W, H));
-            SkAutoUnref aur(device);
+            SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(grContext, info, 0));
+            SkASSERT(device.get());
+
             src = device->accessBitmap(false);
             device->clear(SK_ColorWHITE);
 
             // Draw something different to the same portion of the bitmap that we will extract as a
             // subset, so that comparing the pixels of the subset will be meaningful.
             SkIRect subsetRect = SkIRect::MakeLTRB(W/2, H/2, W, H);
             SkCanvas drawingCanvas(device);
             SkPaint paint;
             paint.setColor(SK_ColorRED);
             drawingCanvas.drawRect(SkRect::Make(subsetRect), paint);
@@ skipping 65 matching lines @@
                     REPORTER_ASSERT(reporter, success == canSucceed);
                     TestIndividualCopy(reporter, gPairs[j].fConfig, success, trueSubset, subsetCopy,
                                        true);
                 }
             } // for (size_t j = ...
         } // for (size_t i = ...
     } // GrContextFactory::GLContextType
 }
 
 #endif