Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(721)

Unified Diff: third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp

Issue 2618633004: Add support for Animated PNG (Closed)
Patch Set: Fix LayoutTest due to accept header change Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp
diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp
index 7e4e93e90a39072faa33203c1a447d343a2fb9cf..9ba0e090c3f7083e5863746294ba12dce12f38a6 100644
--- a/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp
@@ -356,7 +356,7 @@ bool ImageDecoder::initFrameBuffer(size_t frameIndex) {
// This frame doesn't rely on any previous data.
if (!buffer->setSizeAndColorSpace(size().width(), size().height(),
colorSpaceForSkImages())) {
- return setFailed();
+ return false;
}
} else {
ImageFrame* const prevBuffer =
@@ -370,7 +370,7 @@ bool ImageDecoder::initFrameBuffer(size_t frameIndex) {
if ((!canReusePreviousFrameBuffer(frameIndex) ||
!buffer->takeBitmapDataIfWritable(prevBuffer)) &&
!buffer->copyBitmapData(*prevBuffer))
- return setFailed();
+ return false;
if (prevBuffer->getDisposalMethod() ==
ImageFrame::DisposeOverwriteBgcolor) {
@@ -382,10 +382,11 @@ bool ImageDecoder::initFrameBuffer(size_t frameIndex) {
}
}
+ onInitFrameBuffer(frameIndex);
+
// Update our status to be partially complete.
buffer->setStatus(ImageFrame::FramePartial);
- onInitFrameBuffer(frameIndex);
return true;
}

Powered by Google App Engine
This is Rietveld 408576698