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..bdb10a14163da8b14f58569f23638fa5b3db3eea 100644
--- a/src/codec/SkSwizzler.h
+++ b/src/codec/SkSwizzler.h
@@ -163,6 +163,16 @@ public:
         SkSampler::Fill(fillInfo, dst, rowBytes, colorOrIndex, zeroInit);
     }
 
+    /**
+     *  If fSampleX > 1, the swizzler is sampling every fSampleX'th pixel and
+     *  discarding the rest.
+     *
+     *  This getter is 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:
 
     /**