Use SkOpts routines in SkSwizzler

src/codec/SkSwizzler.h

Index: src/codec/SkSwizzler.h
diff --git a/src/codec/SkSwizzler.h b/src/codec/SkSwizzler.h
index bdb10a14163da8b14f58569f23638fa5b3db3eea..153030377976549d7a56e21f0e4f80f25ca014e4 100644
--- a/src/codec/SkSwizzler.h
+++ b/src/codec/SkSwizzler.h
@@ -192,7 +192,11 @@ private:
                                    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
@@ -279,8 +283,8 @@ private:
                                           //     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;