| 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 62 { | 62 { | 
| 63     if (failed()) | 63     if (failed()) | 
| 64         return; | 64         return; | 
| 65 | 65 | 
| 66     // If we couldn't decode the image but we've received all the data, decoding | 66     // If we couldn't decode the image but we've received all the data, decoding | 
| 67     // has failed. | 67     // has failed. | 
| 68     if (!decodeHelper(onlySize) && isAllDataReceived()) | 68     if (!decodeHelper(onlySize) && isAllDataReceived()) | 
| 69         setFailed(); | 69         setFailed(); | 
| 70     // If we're done decoding the image, we don't need the BMPImageReader | 70     // If we're done decoding the image, we don't need the BMPImageReader | 
| 71     // anymore.  (If we failed, |m_reader| has already been cleared.) | 71     // anymore.  (If we failed, |m_reader| has already been cleared.) | 
| 72     else if (!m_frameBufferCache.isEmpty() && (m_frameBufferCache.first().getSta
     tus() == ImageFrame::FrameComplete)) | 72     else if (frameIsCompleteAtIndex(0)) | 
| 73         m_reader.reset(); | 73         m_reader.reset(); | 
| 74 } | 74 } | 
| 75 | 75 | 
| 76 bool BMPImageDecoder::decodeHelper(bool onlySize) | 76 bool BMPImageDecoder::decodeHelper(bool onlySize) | 
| 77 { | 77 { | 
| 78     size_t imgDataOffset = 0; | 78     size_t imgDataOffset = 0; | 
| 79     if ((m_decodedOffset < sizeOfFileHeader) && !processFileHeader(imgDataOffset
     )) | 79     if ((m_decodedOffset < sizeOfFileHeader) && !processFileHeader(imgDataOffset
     )) | 
| 80         return false; | 80         return false; | 
| 81 | 81 | 
| 82     if (!m_reader) { | 82     if (!m_reader) { | 
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 115         POINTER = 0x5054,  // "PT" | 115         POINTER = 0x5054,  // "PT" | 
| 116         COLORICON = 0x4349,  // "CI" | 116         COLORICON = 0x4349,  // "CI" | 
| 117         COLORPOINTER = 0x4350,  // "CP" | 117         COLORPOINTER = 0x4350,  // "CP" | 
| 118         BITMAPARRAY = 0x4241,  // "BA" | 118         BITMAPARRAY = 0x4241,  // "BA" | 
| 119         */ | 119         */ | 
| 120     }; | 120     }; | 
| 121     return (fileType == BMAP) || setFailed(); | 121     return (fileType == BMAP) || setFailed(); | 
| 122 } | 122 } | 
| 123 | 123 | 
| 124 } // namespace blink | 124 } // namespace blink | 
| OLD | NEW | 
|---|