Refactor ImageFrame::setSizeAndColorSpace()

third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 439 matching lines @@
   if (failed())
     return false;
 
   DCHECK(isDecodedSizeAvailable());
 
   DCHECK_GT(m_frameBufferCache.size(), frameIndex);
   ImageFrame& buffer = m_frameBufferCache[frameIndex];
   DCHECK_NE(buffer.getStatus(), ImageFrame::FrameComplete);
 
   if (buffer.getStatus() == ImageFrame::FrameEmpty) {
-    if (!buffer.setSizeAndColorSpace(size().width(), size().height(),
-                                     colorSpaceForSkImages()))
+    if (!buffer.allocatePixelData(size().width(), size().height(),
+                                  colorSpaceForSkImages()))
       return setFailed();
-    buffer.setStatus(ImageFrame::FramePartial);
+    buffer.zeroFillPixelData();
     // The buffer is transparent outside the decoded area while the image is

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

Similarly, this comment seems to apply to the line you've removed.

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

Done.

     // loading. The correct alpha value for the frame will be set when it is
     // fully decoded.
-    buffer.setHasAlpha(true);
+    buffer.setStatus(ImageFrame::FramePartial);
     buffer.setOriginalFrameRect(IntRect(IntPoint(), size()));
   }
 
   const IntRect& frameRect = buffer.originalFrameRect();
   if (!m_decoder) {
     WEBP_CSP_MODE mode = outputMode(m_formatFlags & ALPHA_FLAG);
     if (!m_premultiplyAlpha)
       mode = outputMode(false);
     if (colorTransform()) {
       // Swizzling between RGBA and BGRA is zero cost in a color transform.
@@ skipping 34 matching lines @@
         return false;
       }
     // FALLTHROUGH
     default:
       clear();
       return setFailed();
   }
 }
 
 }  // namespace blink