PNG: Use frame width when applying color xform

third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp

Index: third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
diff --git a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
index cb37d138bd29caa3860fdbdb00875b763aa4a2d3..9364c72a79906194d9df742db7e093d71589afd8 100644
--- a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
@@ -367,7 +367,7 @@ void PNGImageDecoder::rowAvailable(unsigned char* rowBuffer,
   // Write the decoded row pixels to the frame buffer. The repetitive
   // form of the row write loops is for speed.
   ImageFrame::PixelData* const dstRow = buffer.getAddr(frameRect.x(), y);
-  int width = frameRect.width();
+  const int width = frameRect.width();
 
   png_bytep srcPtr = row;
   if (hasAlpha) {
@@ -384,7 +384,7 @@ void PNGImageDecoder::rowAvailable(unsigned char* rowBuffer,
     if (SkColorSpaceXform* xform = colorTransform()) {
       SkColorSpaceXform::ColorFormat colorFormat =
           SkColorSpaceXform::kRGBA_8888_ColorFormat;
-      xform->apply(colorFormat, dstRow, colorFormat, srcPtr, size().width(),
+      xform->apply(colorFormat, dstRow, colorFormat, srcPtr, width,
                    kUnpremul_SkAlphaType);
       srcPtr = png_bytep(dstRow);
     }
@@ -443,7 +443,7 @@ void PNGImageDecoder::rowAvailable(unsigned char* rowBuffer,
     // RGBA (and not RGB).
     if (SkColorSpaceXform* xform = colorTransform()) {
       xform->apply(xformColorFormat(), dstRow, xformColorFormat(), dstRow,
-                   size().width(), kOpaque_SkAlphaType);
+                   width, kOpaque_SkAlphaType);
     }
   }