Make SkAndroidCodec support ico

src/codec/SkSwizzler.h

Index: src/codec/SkSwizzler.h
diff --git a/src/codec/SkSwizzler.h b/src/codec/SkSwizzler.h
index 7f5bbc6209b459ceb38fe217319d3759777c2f9a..8aef6c5da98c14c5d05f003585efa96eb8591847 100644
--- a/src/codec/SkSwizzler.h
+++ b/src/codec/SkSwizzler.h
@@ -163,6 +163,15 @@ public:
         SkSampler::Fill(fillInfo, dst, rowBytes, colorOrIndex, zeroInit);
     }
 
+    /**
+     *  Getter for fSampleX.

[scroggo, 2015/12/03 19:39:25]

This line doesn't state anything that cannot be gleaned from looking at the
code.

I think this should say something about what it means - the swizzler is sampling
every sampleX'th pixel (and discarding the rest).

[msarett, 2015/12/03 19:54:15]

Done.

+     *
+     *  Currently used by SkBmpStandardCodec for Bmp-in-Ico decodes.  Ideally, the
+     *  subclasses of SkCodec would have no knowledge of sampling, but this allows
+     *  us to apply a transparency mask to pixels after swizzling.
+     */
+    int sampleX() const { return fSampleX; }
+
 private:
 
     /**