Use SkOpts routines in SkSwizzler

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 174 matching lines @@
      *  @param deltaSrc bpp * sampleX
      *  @param ctable Colors (used for kIndex source).
      *  @param offset The offset before the first pixel to sample.
                         Is in bytes or bits based on what deltaSrc is in.
      */
     typedef ResultAlpha (*RowProc)(void* SK_RESTRICT dstRow,
                                    const uint8_t* SK_RESTRICT src,
                                    int dstWidth, int bpp, int deltaSrc, int offset,
                                    const SkPMColor ctable[]);
 
-    const RowProc       fRowProc;
+    RowProc             fRowProc;
+    // We use this as a fallback.  If the client requests sampling, we will
+    // most likely need to use this simpler row proc in place of a more highly
+    // optimized version.
+    const RowProc       fScalarRowProc;

[mtklein, 2016/01/08 15:20:19]

Scalar sounds like SkScalar to me.  What about just fRowProc + fFastRowProc?

[msarett, 2016/01/11 20:33:25]

Done.

     const SkPMColor*    fColorTable;      // Unowned pointer
 
     // Subset Swizzles
     // There are two types of subset swizzles that we support.  We do not
     // support both at the same time.
     // TODO: If we want to support partial scanlines for gifs (which may
     //       use frame subsets), we will need to support both subsetting
     //       modes at the same time.
     // (1) Partial Scanlines
     //         The client only wants to write a subset of the source pixels
@@ skipping 66 matching lines @@
     int                 fAllocatedWidth;
 
     int                 fSampleX;         // Step between X samples
     const int           fSrcBPP;          // Bits/bytes per pixel for the SrcConfig
                                           // if bitsPerPixel % 8 == 0
                                           //     fBPP is bytesPerPixel
                                           // else
                                           //     fBPP is bitsPerPixel
     const int           fDstBPP;          // Bytes per pixel for the destination color type
 
-    SkSwizzler(RowProc proc, const SkPMColor* ctable, int srcOffset, int srcWidth, int dstOffset,
-            int dstWidth, int srcBPP, int dstBPP);
+    SkSwizzler(RowProc optProc, RowProc scalarProc, const SkPMColor* ctable, int srcOffset,
+            int srcWidth, int dstOffset, int dstWidth, int srcBPP, int dstBPP);
 
     int onSetSampleX(int) override;
 
 };
 #endif // SkSwizzler_DEFINED