add new copyTo version to SkBitmap, which takes SkColorType

dm/DMWriteTask.cpp

 #include "DMWriteTask.h"
 
 #include "DMUtil.h"
 #include "SkColorPriv.h"
 #include "SkCommandLineFlags.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkString.h"
 #include "SkUnPreMultiply.h"
 
@@ skipping 95 matching lines @@
         SkDebugf("Could not read %s.\n", path.c_str());
         return false;
     }
 
     SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(stream));
     if (NULL == decoder.get()) {
         SkDebugf("Could not find a decoder for %s.\n", path.c_str());
         return false;
     }
 
-    SkImageInfo info;
-    SkAssertResult(bitmap.asImageInfo(&info));
+    const SkImageInfo info = bitmap.info();
 
     SkBitmap expected;
-    expected.setConfig(info);
-    expected.allocPixels();
+    expected.allocPixels(info);
 
     // expected will be unpremultiplied.
     decoder->setRequireUnpremultipliedColors(true);
     if (!decoder->decode(stream, &expected, SkImageDecoder::kDecodePixels_Mode)) {
         SkDebugf("Could not decode %s.\n", path.c_str());
         return false;
     }
 
     // We always seem to decode to 8888.  This puts 565 back in 565.
-    if (expected.config() != bitmap.config()) {
+    if (expected.colorType() != bitmap.colorType()) {
         SkBitmap converted;
-        SkAssertResult(expected.copyTo(&converted, bitmap.config()));
+        SkAssertResult(expected.copyTo(&converted, bitmap.colorType()));
         expected.swap(converted);
     }
     SkASSERT(expected.config() == bitmap.config());
 
     // Manually unpremultiply 8888 bitmaps to match expected.
     // Their pixels are shared, concurrently even, so we must copy them.
-    if (info.fColorType == kPMColor_SkColorType) {
+    if (info.colorType() == kPMColor_SkColorType) {
         SkBitmap unpremul;
-        unpremul.setConfig(info);
-        unpremul.allocPixels();
+        unpremul.allocPixels(info);
 
         SkAutoLockPixels lockSrc(bitmap), lockDst(unpremul);
         const SkPMColor* src = (SkPMColor*)bitmap.getPixels();
         uint32_t* dst = (uint32_t*)unpremul.getPixels();
         for (size_t i = 0; i < bitmap.getSize()/4; i++) {
             dst[i] = SkUnPreMultiply::UnPreMultiplyPreservingByteOrder(src[i]);
         }
         bitmap.swap(unpremul);
     }
 
     return BitmapsEqual(expected, bitmap);
 }
 
 }  // namespace DM