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 11 matching lines...) Expand all Loading... |
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "core/platform/image-decoders/ico/ICOImageDecoder.h" | 32 #include "platform/image-decoders/ico/ICOImageDecoder.h" |
33 | 33 |
34 #include <algorithm> | 34 #include <algorithm> |
35 | 35 |
36 #include "core/platform/image-decoders/png/PNGImageDecoder.h" | |
37 #include "platform/PlatformInstrumentation.h" | 36 #include "platform/PlatformInstrumentation.h" |
| 37 #include "platform/image-decoders/png/PNGImageDecoder.h" |
38 #include "wtf/PassOwnPtr.h" | 38 #include "wtf/PassOwnPtr.h" |
39 | 39 |
40 namespace WebCore { | 40 namespace WebCore { |
41 | 41 |
42 // Number of bits in .ICO/.CUR used to store the directory and its entries, | 42 // Number of bits in .ICO/.CUR used to store the directory and its entries, |
43 // respectively (doesn't match sizeof values for member structs since we omit | 43 // respectively (doesn't match sizeof values for member structs since we omit |
44 // some fields). | 44 // some fields). |
45 static const size_t sizeOfDirectory = 6; | 45 static const size_t sizeOfDirectory = 6; |
46 static const size_t sizeOfDirEntry = 16; | 46 static const size_t sizeOfDirEntry = 16; |
47 | 47 |
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 // Check if this entry is a BMP or a PNG; we need 4 bytes to check the magic | 337 // Check if this entry is a BMP or a PNG; we need 4 bytes to check the magic |
338 // number. | 338 // number. |
339 ASSERT_WITH_SECURITY_IMPLICATION(index < m_dirEntries.size()); | 339 ASSERT_WITH_SECURITY_IMPLICATION(index < m_dirEntries.size()); |
340 const uint32_t imageOffset = m_dirEntries[index].m_imageOffset; | 340 const uint32_t imageOffset = m_dirEntries[index].m_imageOffset; |
341 if ((imageOffset > m_data->size()) || ((m_data->size() - imageOffset) < 4)) | 341 if ((imageOffset > m_data->size()) || ((m_data->size() - imageOffset) < 4)) |
342 return Unknown; | 342 return Unknown; |
343 return strncmp(&m_data->data()[imageOffset], "\x89PNG", 4) ? BMP : PNG; | 343 return strncmp(&m_data->data()[imageOffset], "\x89PNG", 4) ? BMP : PNG; |
344 } | 344 } |
345 | 345 |
346 } | 346 } |
OLD | NEW |