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

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

Issue 1962563002: Fix ImageDecoder::frameIsCompleteAtIndex - fully received instead of decoded. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: extending the scope with naming suggested by @scroggo Created 4 years, 7 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 663f0d5d1ede08172707f54097054bba8349cca9..87502c23fc9cc368998eaa3d251cfbacbbdc604f 100644
--- a/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp
@@ -146,13 +146,12 @@ ImageFrame* ImageDecoder::frameBufferAtIndex(size_t index)
bool ImageDecoder::frameHasAlphaAtIndex(size_t index) const
{
- return !frameIsCompleteAtIndex(index) || m_frameBufferCache[index].hasAlpha();
+ return index >= m_frameBufferCache.size() || m_frameBufferCache[index].hasAlpha();
Peter Kasting 2016/05/10 00:00:13 Will hasAlpha() return true on partially-decoded f
scroggo_chromium 2016/05/10 14:14:37 I think that is the intent. When we create a new I
aleksandar.stojiljkovic 2016/05/10 21:59:31 I disliked that we are handling "decoding partial
Peter Kasting 2016/05/11 00:33:02 Me too, frankly. I don't think that's really some
scroggo_chromium 2016/05/11 15:17:34 Is there an existing caller that needs to know whe
}
-bool ImageDecoder::frameIsCompleteAtIndex(size_t index) const
+bool ImageDecoder::frameIsFullyReceivedAtIndex(size_t index) const
{
- return (index < m_frameBufferCache.size()) &&
- (m_frameBufferCache[index].getStatus() == ImageFrame::FrameComplete);
+ return m_isAllDataReceived;
}
size_t ImageDecoder::frameBytesAtIndex(size_t index) const

Powered by Google App Engine
This is Rietveld 408576698