Refactor ImageFrame::setSizeAndColorSpace()

third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

Index: third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
diff --git a/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
index 641012756bc353bc3cce7b30e28e29cc6acd17a1..d1d2c6f188502e165070b0b41ad0f1d0d5a8acf5 100644
--- a/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
@@ -937,14 +937,15 @@ bool JPEGImageDecoder::outputScanlines() {
     DCHECK_EQ(info->output_height,
               static_cast<JDIMENSION>(m_decodedSize.height()));
 
-    if (!buffer.setSizeAndColorSpace(info->output_width, info->output_height,
-                                     colorSpaceForSkImages()))
+    if (!buffer.allocatePixelData(info->output_width, info->output_height,
+                                  colorSpaceForSkImages()))
       return setFailed();
 
+    buffer.zeroFillPixelData();
+
     // The buffer is transparent outside the decoded area while the image is

[scroggo_chromium, 2017/03/17 14:36:38]

This comment seems to apply to the line that you have removed down below. Remove
it?

[cblume, 2017/03/17 18:05:45]

Done.

     // loading. The image will be marked fully opaque in complete().
     buffer.setStatus(ImageFrame::FramePartial);
-    buffer.setHasAlpha(true);
 
     // For JPEGs, the frame always fills the entire image.
     buffer.setOriginalFrameRect(IntRect(IntPoint(), size()));