Fix SkSwizzler bug

src/codec/SkMaskSwizzler.cpp

Index: src/codec/SkMaskSwizzler.cpp
diff --git a/src/codec/SkMaskSwizzler.cpp b/src/codec/SkMaskSwizzler.cpp
index 9772d87e38e67c31acf41faad788fe0a1567c19c..e28f54aa1a3080a9ca97a718ab052e44546768a5 100644
--- a/src/codec/SkMaskSwizzler.cpp
+++ b/src/codec/SkMaskSwizzler.cpp
@@ -360,11 +360,11 @@ SkMaskSwizzler* SkMaskSwizzler::CreateMaskSwizzler(
  * 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)
 {}
@@ -375,10 +375,10 @@ int SkMaskSwizzler::onSetSampleX(int sampleX) {
                            // 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;
 }