Use fActualProc to choose fFastProc or fSlowProc in SkSwizzler

src/codec/SkSwizzler.cpp

Index: src/codec/SkSwizzler.cpp
diff --git a/src/codec/SkSwizzler.cpp b/src/codec/SkSwizzler.cpp
index 65e521050e7795cfc4be18b55745822308f52afa..d66a4bd15f18b753e90bcc79551495c8c98e66e1 100644
--- a/src/codec/SkSwizzler.cpp
+++ b/src/codec/SkSwizzler.cpp
@@ -769,7 +769,8 @@ SkSwizzler* SkSwizzler::CreateSwizzler(SkSwizzler::SrcConfig sc,
 SkSwizzler::SkSwizzler(RowProc fastProc, RowProc proc, const SkPMColor* ctable, int srcOffset,
         int srcWidth, int dstOffset, int dstWidth, int srcBPP, int dstBPP)
     : fFastProc(fastProc)
-    , fProc(proc)
+    , fSlowProc(proc)
+    , fActualProc(fFastProc ? fFastProc : fSlowProc)
     , fColorTable(ctable)
     , fSrcOffset(srcOffset)
     , fDstOffset(dstOffset)
@@ -794,14 +795,17 @@ int SkSwizzler::onSetSampleX(int sampleX) {
     fAllocatedWidth = get_scaled_dimension(fDstWidth, sampleX);
 
     // The optimized swizzler routines do not (yet) support sampling.
-    fFastProc = nullptr;
+    if (1 == fSampleX) {

[scroggo, 2016/01/21 17:24:59]

You could simplify this a little to say:

if (1 == fSampleX && fFastProc) {
    fActualProc = fFastProc;
} else {
    fActualProc = fSlowProc;
}

[msarett, 2016/01/21 17:45:33]

Done.

+        fActualProc = fFastProc ? fFastProc : fSlowProc;
+    } else {
+        fActualProc = fSlowProc;
+    }
 
     return fAllocatedWidth;
 }
 
 void SkSwizzler::swizzle(void* dst, const uint8_t* SK_RESTRICT src) {
     SkASSERT(nullptr != dst && nullptr != src);
-    RowProc proc = fFastProc ? fFastProc : fProc;
-    proc(SkTAddOffset<void>(dst, fDstOffsetBytes), src, fSwizzleWidth, fSrcBPP,
+    fActualProc(SkTAddOffset<void>(dst, fDstOffsetBytes), src, fSwizzleWidth, fSrcBPP,
             fSampleX * fSrcBPP, fSrcOffsetUnits, fColorTable);
 }