Refactor ImageFrame::setSizeAndColorSpace()

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

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  *
  * Portions are Copyright (C) 2001-6 mozilla.org
  *
  * Other contributors:
  *   Stuart Parmenter <stuart@mozilla.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ skipping 919 matching lines @@
   jpeg_decompress_struct* info = m_reader->info();
 
   // Initialize the framebuffer if needed.
   ImageFrame& buffer = m_frameBufferCache[0];
   if (buffer.getStatus() == ImageFrame::FrameEmpty) {
     DCHECK_EQ(info->output_width,
               static_cast<JDIMENSION>(m_decodedSize.width()));
     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()));
   }
 
 #if defined(TURBO_JPEG_RGB_SWIZZLE)
   if (turboSwizzled(info->out_color_space)) {
     while (info->output_scanline < info->output_height) {
       unsigned char* row = reinterpret_cast_ptr<unsigned char*>(
           buffer.getAddr(0, info->output_scanline));
@@ skipping 51 matching lines @@
   // has failed.
   if (!m_reader->decode(onlySize) && isAllDataReceived())
     setFailed();
 
   // If decoding is done or failed, we don't need the JPEGImageReader anymore.
   if (isComplete(this, onlySize) || failed())
     m_reader.reset();
 }
 
 }  // namespace blink