Pull up initFrameBuffer to ImageDecoder.

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 205 matching lines @@
       clearFrameBuffer(i);
     }
   }
   return frameBytesCleared;
 }
 
 void ImageDecoder::clearFrameBuffer(size_t frameIndex) {
   m_frameBufferCache[frameIndex].clearPixelData();
 }
 
+bool ImageDecoder::initFrameBuffer(size_t frameIndex) {
+  DCHECK(frameIndex < m_frameBufferCache.size());
+
+  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(),
+                                      colorSpace())) {
+      return setFailed();
+    }
+  } 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) ||
+         !buffer->takeBitmapDataIfWritable(prevBuffer)) &&
+        !buffer->copyBitmapData(*prevBuffer))
+      return setFailed();
+
+    if (prevBuffer->getDisposalMethod() ==
+        ImageFrame::DisposeOverwriteBgcolor) {
+      // We want to clear the previous frame to transparent, without
+      // affecting pixels in the image outside of the frame.
+      const IntRect& prevRect = prevBuffer->originalFrameRect();
+      DCHECK(!prevRect.contains(IntRect(IntPoint(), size())));
+      buffer->zeroFillFrameRect(prevRect);
+    }
+  }
+
+  // Update our status to be partially complete.
+  buffer->setStatus(ImageFrame::FramePartial);
+
+  onInitFrameBuffer(frameIndex);
+  return true;
+}
+
 void ImageDecoder::updateAggressivePurging(size_t index) {
   if (m_purgeAggressively)
     return;
 
   // We don't want to cache so much that we cause a memory issue.
   //
   // If we used a LRU cache we would fill it and then on next animation loop
   // we would need to decode all the frames again -- the LRU would give no
   // benefit and would consume more memory.
   // So instead, simply purge unused frames if caching all of the frames of
@@ skipping 173 matching lines @@
 
   if (SkColorSpace::Equals(m_embeddedColorSpace.get(), gTargetColorSpace)) {
     return;
   }
 
   m_sourceToOutputDeviceColorTransform =
       SkColorSpaceXform::New(m_embeddedColorSpace.get(), gTargetColorSpace);
 }
 
 }  // namespace blink