Offer single-param version of deepCopyTo -- much easier to migrate to colortypes

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 143 matching lines @@
             // 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);
 
             // Extract a subset. If this succeeds we will test copying the subset.
             SkBitmap subset;
+#ifdef SK_SUPPORT_DEEPCOPYTO_CONFIG
             const bool extracted = src.extractSubset(&subset, subsetRect);
 
             for (size_t j = 0; j < SK_ARRAY_COUNT(gPairs); j++) {
                 dst.reset();
                 bool success = src.deepCopyTo(&dst, gPairs[j].fConfig);
                 bool expected = gPairs[i].fValid[j] != '0';
                 if (success != expected) {
                     ERRORF(reporter, "SkBitmap::deepCopyTo from %s to %s. "
                            "expected %s returned %s", gConfigName[i],
                            gConfigName[j], boolStr(expected),
@@ skipping 47 matching lines @@
                     // deepCopyTo copies the entire pixelref, even if the bitmap only represents
                     // a subset. Therefore, the result should share the same genID.
                     subsetCopy.reset();
                     success = trueSubset.deepCopyTo(&subsetCopy, gPairs[j].fConfig);
                     REPORTER_ASSERT(reporter, success == expected);
                     REPORTER_ASSERT(reporter, success == canSucceed);
                     TestIndividualCopy(reporter, gPairs[j].fConfig, success, trueSubset, subsetCopy,
                                        true);
                 }
             } // for (size_t j = ...
+#endif
         } // for (size_t i = ...
     } // GrContextFactory::GLContextType
 }
 
 #endif