OLD | NEW |
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 131 matching lines...) Loading... |
142 // may have called SharedBuffer::mergeSegmentsIntoBuffer(). | 142 // may have called SharedBuffer::mergeSegmentsIntoBuffer(). |
143 m_fastReader.clearCache(); | 143 m_fastReader.clearCache(); |
144 | 144 |
145 // If we couldn't decode the image but we've received all the data, decoding | 145 // If we couldn't decode the image but we've received all the data, decoding |
146 // has failed. | 146 // has failed. |
147 if ((!decodeDirectory() || (!onlySize && !decodeAtIndex(index))) && isAllDat
aReceived()) { | 147 if ((!decodeDirectory() || (!onlySize && !decodeAtIndex(index))) && isAllDat
aReceived()) { |
148 setFailed(); | 148 setFailed(); |
149 // If we're done decoding this frame, we don't need the BMPImageReader or | 149 // If we're done decoding this frame, we don't need the BMPImageReader or |
150 // PNGImageDecoder anymore. (If we failed, these have already been | 150 // PNGImageDecoder anymore. (If we failed, these have already been |
151 // cleared.) | 151 // cleared.) |
152 } else if ((m_frameBufferCache.size() > index) && (m_frameBufferCache[index]
.getStatus() == ImageFrame::FrameComplete)) { | 152 } else if (frameIsCompleteAtIndex(index)) { |
153 m_bmpReaders[index].reset(); | 153 m_bmpReaders[index].reset(); |
154 m_pngDecoders[index].reset(); | 154 m_pngDecoders[index].reset(); |
155 } | 155 } |
156 } | 156 } |
157 | 157 |
158 bool ICOImageDecoder::decodeDirectory() | 158 bool ICOImageDecoder::decodeDirectory() |
159 { | 159 { |
160 // Read and process directory. | 160 // Read and process directory. |
161 if ((m_decodedOffset < sizeOfDirectory) && !processDirectory()) | 161 if ((m_decodedOffset < sizeOfDirectory) && !processDirectory()) |
162 return false; | 162 return false; |
(...skipping 142 matching lines...) Loading... |
305 ASSERT_WITH_SECURITY_IMPLICATION(index < m_dirEntries.size()); | 305 ASSERT_WITH_SECURITY_IMPLICATION(index < m_dirEntries.size()); |
306 const uint32_t imageOffset = m_dirEntries[index].m_imageOffset; | 306 const uint32_t imageOffset = m_dirEntries[index].m_imageOffset; |
307 if ((imageOffset > m_data->size()) || ((m_data->size() - imageOffset) < 4)) | 307 if ((imageOffset > m_data->size()) || ((m_data->size() - imageOffset) < 4)) |
308 return Unknown; | 308 return Unknown; |
309 char buffer[4]; | 309 char buffer[4]; |
310 const char* data = m_fastReader.getConsecutiveData(imageOffset, 4, buffer); | 310 const char* data = m_fastReader.getConsecutiveData(imageOffset, 4, buffer); |
311 return strncmp(data, "\x89PNG", 4) ? BMP : PNG; | 311 return strncmp(data, "\x89PNG", 4) ? BMP : PNG; |
312 } | 312 } |
313 | 313 |
314 } // namespace blink | 314 } // namespace blink |
OLD | NEW |