Swizzler changes Index8 and 565

dm/DMSrcSink.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef DMSrcSink_DEFINED
 #define DMSrcSink_DEFINED
 
 #include "DMGpuSupport.h"
 #include "SkBBHFactory.h"
 #include "SkBBoxHierarchy.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
+#include "SkCodec.h"
 #include "SkData.h"
 #include "SkGPipe.h"
 #include "SkPicture.h"
 #include "gm.h"
 
 namespace DM {
 
 // This is just convenience.  It lets you use either return "foo" or return SkStringPrintf(...).
 struct ImplicitString : public SkString {
     template <typename T>
@@ skipping 61 matching lines @@
 private:
     skiagm::GMRegistry::Factory fFactory;
 };
 
 class CodecSrc : public Src {
 public:
     enum Mode {
         kNormal_Mode,
         kScanline_Mode,
     };
-    CodecSrc(Path, Mode);
+    enum DstColorType {
+        kGetFromCanvas_DstColorType,
+        kIndex8_Always_DstColorType,
+        kGrayscale_Always_DstColorType,
+    };
+    CodecSrc(Path, Mode, DstColorType, SkCodec*);

[scroggo, 2015/04/08 17:21:27]

Comment about ownership?

(Note that I'm commenting on this, but if we decide *not* to pass the SkCodec to
the constructor, you can ignore them.)

[msarett, 2015/04/08 19:35:40]

Done.

 
     Error draw(SkCanvas*) const override;
     SkISize size() const override;
     Name name() const override;
 private:
-    Path fPath;
-    Mode fMode;
+    Path                   fPath;
+    Mode                   fMode;
+    DstColorType           fDstColorType;
+    SkAutoTDelete<SkCodec> fCodec;
 };
 
 
 class ImageSrc : public Src {
 public:
     // divisor == 0 means decode the whole image
     // divisor > 0 means decode in subsets, dividing into a divisor x divisor grid.
     explicit ImageSrc(Path path, int divisor = 0);
 
     Error draw(SkCanvas*) const override;
@@ skipping 158 matching lines @@
     Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override;
     int enclave() const override { return fSink->enclave(); }
     const char* fileExtension() const override { return fSink->fileExtension(); }
 private:
     SkAutoTDelete<Sink>  fSink;
 };
 
 }  // namespace DM
 
 #endif//DMSrcSink_DEFINED