Chromium Code Reviews| 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 fae908a78e567ec303b4b967a767735cffe0861c..dcc7c3ac66909cbcea542138c771747a4de2e617 100644 |
| --- a/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp |
| +++ b/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp |
| @@ -166,14 +166,11 @@ int WEBPImageDecoder::repetitionCount() const |
| return failed() ? cAnimationLoopOnce : m_repetitionCount; |
| } |
| -bool WEBPImageDecoder::frameIsCompleteAtIndex(size_t index) const |
| +bool WEBPImageDecoder::frameIsFullyReceivedAtIndex(size_t index) const |
| { |
| - if (!m_demux || m_demuxState <= WEBP_DEMUX_PARSING_HEADER) |
| - return false; |
| if (!(m_formatFlags & ANIMATION_FLAG)) |
| - return ImageDecoder::frameIsCompleteAtIndex(index); |
| - bool frameIsLoadedAtIndex = index < m_frameBufferCache.size(); |
| - return frameIsLoadedAtIndex; |
| + return ImageDecoder::frameIsFullyReceivedAtIndex(index) || frameIsCompleteAtIndex(index); |
|
scroggo_chromium
2016/05/24 13:55:14
Do you need "|| frameIsCompleteAtIndex(index)"? Is
aleksandar.stojiljkovic
2016/05/24 19:24:34
Yes, that is exactly the case. WebP parsing doesn'
|
| + return index < m_frameBufferCache.size() || failed(); |
| } |
| float WEBPImageDecoder::frameDurationAtIndex(size_t index) const |