Fix SkSwizzler bug

src/codec/SkMaskSwizzler.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCodecPriv.h"
 #include "SkColorPriv.h"
 #include "SkMaskSwizzler.h"
@@ skipping 342 matching lines @@
     }
 
     return new SkMaskSwizzler(dstInfo.width(), masks, proc);
 }
 
 /*
  *
  * Constructor for mask swizzler
  *
  */
-SkMaskSwizzler::SkMaskSwizzler(int width, SkMasks* masks, RowProc proc)
+SkMaskSwizzler::SkMaskSwizzler(int subsetWidth, SkMasks* masks, RowProc proc)
     : fMasks(masks)
     , fRowProc(proc)
-    , fSrcWidth(width)
-    , fDstWidth(width)
+    , fSubsetWidth(subsetWidth)
+    , fDstWidth(subsetWidth)
     , fSampleX(1)
     , fX0(0)
 {}
 
 int SkMaskSwizzler::onSetSampleX(int sampleX) {
     // FIXME: Share this function with SkSwizzler?
     SkASSERT(sampleX > 0); // Surely there is an upper limit? Should there be
                            // way to report failure?
     fSampleX = sampleX;
     fX0 = get_start_coord(sampleX);
-    fDstWidth = get_scaled_dimension(fSrcWidth, sampleX);
+    fDstWidth = get_scaled_dimension(fSubsetWidth, sampleX);
 
     // check that fX0 is less than original width

[scroggo, 2015/10/16 13:36:16]

This comment no longer applies

[msarett, 2015/10/16 17:36:52]

Done.

-    SkASSERT(fX0 >= 0 && fX0 < fSrcWidth);
+    SkASSERT(fX0 >= 0);
     return fDstWidth;
 }
 
 /*
  *
  * Swizzle the specified row
  *
  */
 SkSwizzler::ResultAlpha SkMaskSwizzler::swizzle(void* dst, const uint8_t* SK_RESTRICT src) {
     SkASSERT(nullptr != dst && nullptr != src);
     return fRowProc(dst, src, fDstWidth, fMasks, fX0, fSampleX);
 }