Fill incomplete images in SkCodec parent class

src/codec/SkSwizzler.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 SkSwizzler_DEFINED
 #define SkSwizzler_DEFINED
 
@@ skipping 112 matching lines @@
      *  @param dstInfo Describes the destination.
      *  @param ZeroInitialized Whether dst is zero-initialized. The
      *                         implementation may choose to skip writing zeroes
      *                         if set to kYes_ZeroInitialized.
      *  @return A new SkSwizzler or nullptr on failure.
      */
     static SkSwizzler* CreateSwizzler(SrcConfig, const SkPMColor* ctable,
                                       const SkImageInfo& dstInfo, SkCodec::ZeroInitialized);
 
     /**
-     * Fill the remainder of the destination with a single color
-     *
-     * @param dstStartRow
-     * The destination row to fill from.
-     *
-     * @param numRows
-     * The number of rows to fill.
-     *
-     * @param colorOrIndex
-     * @param colorTable
-     * If dstInfo.colorType() is kIndex8, colorOrIndex is assumed to be a uint8_t
-     * index, and colorTable is ignored. Each 8-bit pixel will be set to (uint8_t)
-     * index.
-     *
-     * If dstInfo.colorType() is kN32, colorOrIndex is treated differently depending on
-     * whether colorTable is nullptr:
-     *
-     * A nullptr colorTable means colorOrIndex is treated as an SkPMColor (premul or
-     * unpremul, depending on dstInfo.alphaType()). Each 4-byte pixel will be set to
-     * colorOrIndex.
-
-     * A non-nullptr colorTable means colorOrIndex is treated as a uint8_t index into
-     * the colorTable. i.e. each 4-byte pixel will be set to
-     * colorTable[(uint8_t) colorOrIndex].
-     *
-     * If dstInfo.colorType() is kGray, colorOrIndex is always treated as an 8-bit color.
-     *
-     * Other SkColorTypes are not supported.
-     *
-     * @param zeroInit
-     * Indicates whether memory is already zero initialized.
-     *
-     */
-    static void Fill(void* dstStartRow, const SkImageInfo& dstInfo, size_t dstRowBytes,
-            uint32_t numRows, uint32_t colorOrIndex, const SkPMColor* colorTable,
-            SkCodec::ZeroInitialized zeroInit);
-
-    /**
      *  Swizzle a line. Generally this will be called height times, once
      *  for each row of source.
      *  By allowing the caller to pass in the dst pointer, we give the caller
      *  flexibility to use the swizzler even when the encoded data does not
      *  store the rows in order.  This also improves usability for scaled and
      *  subset decodes.
      *  @param dst Where we write the output.
      *  @param src The next row of the source data.
      *  @return A result code describing if the row was fully opaque, fully
      *          transparent, or neither
      */
     ResultAlpha swizzle(void* dst, const uint8_t* SK_RESTRICT src);
 
+    /**
+     * Implement fill using a custom width.
+     */
+    void fill(const SkImageInfo& info, void* dst, size_t rowBytes, uint32_t colorOrIndex,
+            SkCodec::ZeroInitialized zeroInit) override {
+        const SkImageInfo fillInfo = info.makeWH(fDstWidth, info.height());
+        SkSampler::Fill(fillInfo, dst, rowBytes, colorOrIndex, zeroInit);
+    }
+
 private:
 
     /**
      *  Method for converting raw data to Skia pixels.
      *  @param dstRow Row in which to write the resulting pixels.
      *  @param src Row of src data, in format specified by SrcConfig
      *  @param dstWidth Width in pixels of the destination
      *  @param bpp if bitsPerPixel % 8 == 0, deltaSrc is bytesPerPixel
      *             else, deltaSrc is bitsPerPixel
      *  @param deltaSrc bpp * sampleX
@@ skipping 13 matching lines @@
                                           // else
                                           //     deltaSrc is bitsPerPixel
     const int           fSrcWidth;        // Width of the source - i.e. before any sampling.
     int                 fDstWidth;        // Width of dst, which may differ with sampling.
     int                 fX0;              // first X coord to sample
     int                 fSampleX;         // step between X samples
 
     SkSwizzler(RowProc proc, const SkPMColor* ctable, int deltaSrc, int srcWidth);
 
     int onSetSampleX(int) override;
+
 };
 #endif // SkSwizzler_DEFINED