commit 80803ff615e4293e8af2dc5d094a1f4fa81ec396
author msarett <msarett@google.com> Fri Oct 16 10:54:12 2015 -0700
committer Commit bot <commit-bot@chromium.org> Fri Oct 16 10:54:12 2015 -0700
tree 55fd5de502dc7ac897ee6438dd77134115a10048
parent 2e2ea38bb77d42bab292919de5d80286cc354782

Fix SkSwizzler bug

Now, that we are subsetting, fX0 is not necessarily less than
fSrcWidth (since fSrcWidth is really the subset width).

Ex: We may want a 10 pixel subset starting twenty pixels from the
left edge.  In that case, fX0=20 and fSrcWidth=10.

Let's rename the width as fSubsetWidth to avoid confusion
and remove the check.

BUG=skia:

Review URL: https://codereview.chromium.org/1407603003

src/codec/SkMaskSwizzler.cpp

diff --git a/src/codec/SkMaskSwizzler.cpp b/src/codec/SkMaskSwizzler.cpp
index 72dca28..958df61 100644
--- a/src/codec/SkMaskSwizzler.cpp
+++ b/src/codec/SkMaskSwizzler.cpp
@@ -367,11 +367,11 @@
  * Constructor for mask swizzler
  *
  */
-SkMaskSwizzler::SkMaskSwizzler(SkMasks* masks, RowProc proc, int srcOffset, int srcWidth)
+SkMaskSwizzler::SkMaskSwizzler(SkMasks* masks, RowProc proc, int srcOffset, int subsetWidth)
     : fMasks(masks)
     , fRowProc(proc)
-    , fSrcWidth(srcWidth)
-    , fDstWidth(srcWidth)
+    , fSubsetWidth(subsetWidth)
+    , fDstWidth(subsetWidth)
     , fSampleX(1)
     , fSrcOffset(srcOffset)
     , fX0(srcOffset)
@@ -383,10 +383,10 @@
                            // way to report failure?
     fSampleX = sampleX;
     fX0 = get_start_coord(sampleX) + fSrcOffset;
-    fDstWidth = get_scaled_dimension(fSrcWidth, sampleX);
+    fDstWidth = get_scaled_dimension(fSubsetWidth, sampleX);
 
-    // check that fX0 is less than original width
-    SkASSERT(fX0 >= 0 && fX0 < fSrcWidth);
+    // check that fX0 is valid
+    SkASSERT(fX0 >= 0);
     return fDstWidth;
 }