Refactor ImageFrame::setSizeAndColorSpace()

third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp

 /*
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 336 matching lines @@
 
   ImageFrame* const buffer = &m_frameBufferCache[frameIndex];
 
   // If the frame is already initialized, return true.
   if (buffer->getStatus() != ImageFrame::FrameEmpty)
     return true;
 
   size_t requiredPreviousFrameIndex = buffer->requiredPreviousFrameIndex();
   if (requiredPreviousFrameIndex == kNotFound) {
     // This frame doesn't rely on any previous data.
-    if (!buffer->setSizeAndColorSpace(size().width(), size().height(),
-                                      colorSpaceForSkImages())) {
+    if (!buffer->allocatePixelData(size().width(), size().height(),
+                                   colorSpaceForSkImages())) {
       return false;
     }
+    buffer->zeroFillPixelData();
   } else {
     ImageFrame* const prevBuffer =
         &m_frameBufferCache[requiredPreviousFrameIndex];
     DCHECK(prevBuffer->getStatus() == ImageFrame::FrameComplete);
 
     // We try to reuse |prevBuffer| as starting state to avoid copying.
     // If canReusePreviousFrameBuffer returns false, we must copy the data since
     // |prevBuffer| is necessary to decode this or later frames. In that case,
     // copy the data instead.
     if ((!canReusePreviousFrameBuffer(frameIndex) ||
@@ skipping 176 matching lines @@
 sk_sp<SkColorSpace> ImageDecoder::colorSpaceForSkImages() const {
   if (!m_colorBehavior.isTag())
     return nullptr;
 
   if (m_embeddedColorSpace)
     return m_embeddedColorSpace;
   return SkColorSpace::MakeSRGB();
 }
 
 }  // namespace blink