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

Side by Side Diff: third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved. 2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 // may have called SharedBuffer::mergeSegmentsIntoBuffer(). 140 // may have called SharedBuffer::mergeSegmentsIntoBuffer().
141 m_fastReader.clearCache(); 141 m_fastReader.clearCache();
142 142
143 // If we couldn't decode the image but we've received all the data, decoding 143 // If we couldn't decode the image but we've received all the data, decoding
144 // has failed. 144 // has failed.
145 if ((!decodeDirectory() || (!onlySize && !decodeAtIndex(index))) && isAllDat aReceived()) { 145 if ((!decodeDirectory() || (!onlySize && !decodeAtIndex(index))) && isAllDat aReceived()) {
146 setFailed(); 146 setFailed();
147 // If we're done decoding this frame, we don't need the BMPImageReader or 147 // If we're done decoding this frame, we don't need the BMPImageReader or
148 // PNGImageDecoder anymore. (If we failed, these have already been 148 // PNGImageDecoder anymore. (If we failed, these have already been
149 // cleared.) 149 // cleared.)
150 } else if ((m_frameBufferCache.size() > index) && (m_frameBufferCache[index] .getStatus() == ImageFrame::FrameComplete)) { 150 } else if (frameIsCompleteAtIndex(index)) {
151 m_bmpReaders[index].clear(); 151 m_bmpReaders[index].clear();
152 m_pngDecoders[index].clear(); 152 m_pngDecoders[index].clear();
153 } 153 }
154 } 154 }
155 155
156 bool ICOImageDecoder::decodeDirectory() 156 bool ICOImageDecoder::decodeDirectory()
157 { 157 {
158 // Read and process directory. 158 // Read and process directory.
159 if ((m_decodedOffset < sizeOfDirectory) && !processDirectory()) 159 if ((m_decodedOffset < sizeOfDirectory) && !processDirectory())
160 return false; 160 return false;
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 ASSERT_WITH_SECURITY_IMPLICATION(index < m_dirEntries.size()); 298 ASSERT_WITH_SECURITY_IMPLICATION(index < m_dirEntries.size());
299 const uint32_t imageOffset = m_dirEntries[index].m_imageOffset; 299 const uint32_t imageOffset = m_dirEntries[index].m_imageOffset;
300 if ((imageOffset > m_data->size()) || ((m_data->size() - imageOffset) < 4)) 300 if ((imageOffset > m_data->size()) || ((m_data->size() - imageOffset) < 4))
301 return Unknown; 301 return Unknown;
302 char buffer[4]; 302 char buffer[4];
303 const char* data = m_fastReader.getConsecutiveData(imageOffset, 4, buffer); 303 const char* data = m_fastReader.getConsecutiveData(imageOffset, 4, buffer);
304 return strncmp(data, "\x89PNG", 4) ? BMP : PNG; 304 return strncmp(data, "\x89PNG", 4) ? BMP : PNG;
305 } 305 }
306 306
307 } // namespace blink 307 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698