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

Unified Diff: third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.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
« no previous file with comments | « third_party/WebKit/Source/platform/image-decoders/png/PNGImageReader.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp
diff --git a/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp
index 27757d089441b3ae6fd6878105736ce47dd26946..8a3b219e91213d6ac4c1ec1b2f7388b898b32ba3 100644
--- a/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp
@@ -164,8 +164,8 @@ bool WEBPImageDecoder::frameIsCompleteAtIndex(size_t index) const {
return false;
if (!(m_formatFlags & ANIMATION_FLAG))
return ImageDecoder::frameIsCompleteAtIndex(index);
- bool frameIsLoadedAtIndex = index < m_frameBufferCache.size();
- return frameIsLoadedAtIndex;
+ bool frameIsReceivedAtIndex = index < m_frameBufferCache.size();
+ return frameIsReceivedAtIndex;
}
float WEBPImageDecoder::frameDurationAtIndex(size_t index) const {
@@ -417,8 +417,11 @@ void WEBPImageDecoder::decode(size_t index) {
DCHECK(m_demux);
for (auto i = framesToDecode.rbegin(); i != framesToDecode.rend(); ++i) {
- if ((m_formatFlags & ANIMATION_FLAG) && !initFrameBuffer(*i))
+ if ((m_formatFlags & ANIMATION_FLAG) && !initFrameBuffer(*i)) {
+ setFailed();
return;
+ }
+
WebPIterator webpFrame;
if (!WebPDemuxGetFrame(m_demux, *i + 1, &webpFrame)) {
setFailed();
« no previous file with comments | « third_party/WebKit/Source/platform/image-decoders/png/PNGImageReader.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698