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

src/utils/SkGatherPixelRefsAndRects.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGatherPixelRefsAndRects_DEFINED
 #define SkGatherPixelRefsAndRects_DEFINED
 
@@ skipping 10 matching lines @@
 // device bounds to the user provided SkPixelRefContainer-derived object
 class SkGatherPixelRefsAndRectsDevice : public SkBaseDevice {
 public:
     SK_DECLARE_INST_COUNT(SkGatherPixelRefsAndRectsDevice)
 
     SkGatherPixelRefsAndRectsDevice(int width, int height,
                                     SkPictureUtils::SkPixelRefContainer* prCont) {
         fSize.set(width, height);
         fPRCont = prCont;
         SkSafeRef(fPRCont);
-        fEmptyBitmap.setConfig(SkBitmap::kNo_Config, width, height);
+        fEmptyBitmap.setConfig(SkImageInfo::Make(width, height,
+                                                 kUnknown_SkColorType,
+                                                 kIgnore_SkAlphaType));
     }
 
     virtual ~SkGatherPixelRefsAndRectsDevice() {
         SkSafeUnref(fPRCont);
     }
 
     virtual uint32_t getDeviceCapabilities() SK_OVERRIDE { return 0; }
 
     virtual int width() const SK_OVERRIDE { return fSize.width(); }
     virtual int height() const SK_OVERRIDE { return fSize.height(); }
     virtual bool isOpaque() const SK_OVERRIDE { return false; }
     virtual SkBitmap::Config config() const SK_OVERRIDE {
         return SkBitmap::kNo_Config;
     }
+    virtual SkImageInfo imageInfo() const SK_OVERRIDE {
+        return fEmptyBitmap.info();
+    }
+
     virtual void writePixels(const SkBitmap& bitmap, int x, int y,
                              SkCanvas::Config8888 config8888) SK_OVERRIDE {
         NotSupported();
     }
     virtual GrRenderTarget* accessRenderTarget() SK_OVERRIDE { return NULL; }
 
 protected:
     virtual bool filterTextFlags(const SkPaint& paint, TextFlags*) SK_OVERRIDE {
         return false;
     }
@@ skipping 263 matching lines @@
                 return SkShader::kNone_BitmapType != shader->asABitmap(bitmap, NULL, NULL);
             }
         }
         return false;
     }
 
     virtual void replaceBitmapBackendForRasterSurface(const SkBitmap&) SK_OVERRIDE {
         NotSupported();
     }
 
-    virtual SkBaseDevice* onCreateCompatibleDevice(SkBitmap::Config config,
-                                                   int width, int height,
-                                                   bool isOpaque,
-                                                   Usage usage) SK_OVERRIDE {
+    virtual SkBaseDevice* onCreateDevice(const SkImageInfo& info, Usage usage) SK_OVERRIDE {
         // we expect to only get called via savelayer, in which case it is fine.
         SkASSERT(kSaveLayer_Usage == usage);
-        return SkNEW_ARGS(SkGatherPixelRefsAndRectsDevice, (width, height, fPRCont));
+        return SkNEW_ARGS(SkGatherPixelRefsAndRectsDevice,
+                          (info.width(), info.height(), fPRCont));
     }
 
     virtual void flush() SK_OVERRIDE {}
 
     static void NotSupported() {
         SkDEBUGFAIL("this method should never be called");
     }
 
     static void NothingToDo() {}
 
     typedef SkBaseDevice INHERITED;
 };
 
 #endif // SkGatherPixelRefsAndRects_DEFINED