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

src/core/SkDevice.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 "SkDevice.h"
 #include "SkMetaData.h"
 
@@ skipping 24 matching lines @@
 #endif
 {
     fOrigin.setZero();
     fMetaData = NULL;
 }
 
 SkBaseDevice::~SkBaseDevice() {
     delete fMetaData;
 }
 
+SkBaseDevice* SkBaseDevice::createCompatibleDevice(const SkImageInfo& info) {
+#ifdef SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG
+    // We call the old method to support older subclasses.
+    // If they have, we return their device, else we use the new impl.
+    SkBitmap::Config config = SkColorTypeToBitmapConfig(info.colorType());
+    SkBaseDevice* dev = this->onCreateCompatibleDevice(config,
+                                                       info.width(),
+                                                       info.height(),
+                                                       info.isOpaque(),
+                                                       kGeneral_Usage);
+    if (dev) {
+        return dev;
+    }
+    // fall through to new impl
+#endif
+    return this->onCreateDevice(info, kGeneral_Usage);
+}
+
+SkBaseDevice* SkBaseDevice::createCompatibleDeviceForSaveLayer(const SkImageInfo& info) {
+#ifdef SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG
+    // We call the old method to support older subclasses.
+    // If they have, we return their device, else we use the new impl.
+    SkBitmap::Config config = SkColorTypeToBitmapConfig(info.colorType());
+    SkBaseDevice* dev = this->onCreateCompatibleDevice(config,
+                                                       info.width(),
+                                                       info.height(),
+                                                       info.isOpaque(),
+                                                       kSaveLayer_Usage);
+    if (dev) {
+        return dev;
+    }
+    // fall through to new impl
+#endif
+    return this->onCreateDevice(info, kSaveLayer_Usage);
+}
+
+#ifdef SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG
 SkBaseDevice* SkBaseDevice::createCompatibleDevice(SkBitmap::Config config,
                                                    int width, int height,
                                                    bool isOpaque) {
-    return this->onCreateCompatibleDevice(config, width, height,
-                                          isOpaque, kGeneral_Usage);
+    SkImageInfo info = SkImageInfo::Make(width, height,
+                                         SkBitmapConfigToColorType(config),
+                                         isOpaque ? kOpaque_SkAlphaType
+                                                  : kPremul_SkAlphaType);
+    return this->createCompatibleDevice(info);
 }
-
-SkBaseDevice* SkBaseDevice::createCompatibleDeviceForSaveLayer(SkBitmap::Config config,
-                                                               int width, int height,
-                                                               bool isOpaque) {
-    return this->onCreateCompatibleDevice(config, width, height,
-                                          isOpaque, kSaveLayer_Usage);
-}
+#endif
 
 SkMetaData& SkBaseDevice::getMetaData() {
     // metadata users are rare, so we lazily allocate it. If that changes we
     // can decide to just make it a field in the device (rather than a ptr)
     if (NULL == fMetaData) {
         fMetaData = new SkMetaData;
     }
     return *fMetaData;
 }
 
@@ skipping 50 matching lines @@
                                      config8888);
     if (result && bmp == &tmp) {
         tmp.swap(*bitmap);
     }
     return result;
 }
 
 SkSurface* SkBaseDevice::newSurface(const SkImageInfo&) { return NULL; }
 
 const void* SkBaseDevice::peekPixels(SkImageInfo*, size_t*) { return NULL; }