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

Side by Side Diff: Source/core/platform/image-decoders/ico/ICOImageDecoder.cpp

Issue 14488003: Absolutify paths to platform/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: scripts, iwyu Created 7 years, 8 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 | Annotate | Revision Log
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 15 matching lines...) Expand all
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 "core/platform/image-decoders/ico/ICOImageDecoder.h"
33 33
34 #include <algorithm> 34 #include <algorithm>
35 35
36 #include "PlatformInstrumentation.h" 36 #include "core/platform/PlatformInstrumentation.h"
37 #include "core/platform/image-decoders/bmp/BMPImageReader.h" 37 #include "core/platform/image-decoders/bmp/BMPImageReader.h"
38 #include "core/platform/image-decoders/png/PNGImageDecoder.h" 38 #include "core/platform/image-decoders/png/PNGImageDecoder.h"
39 #include <wtf/PassOwnPtr.h> 39 #include <wtf/PassOwnPtr.h>
40 40
41 namespace WebCore { 41 namespace WebCore {
42 42
43 // Number of bits in .ICO/.CUR used to store the directory and its entries, 43 // Number of bits in .ICO/.CUR used to store the directory and its entries,
44 // respectively (doesn't match sizeof values for member structs since we omit 44 // respectively (doesn't match sizeof values for member structs since we omit
45 // some fields). 45 // some fields).
46 static const size_t sizeOfDirectory = 6; 46 static const size_t sizeOfDirectory = 6;
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 // Check if this entry is a BMP or a PNG; we need 4 bytes to check the magic 333 // Check if this entry is a BMP or a PNG; we need 4 bytes to check the magic
334 // number. 334 // number.
335 ASSERT_WITH_SECURITY_IMPLICATION(index < m_dirEntries.size()); 335 ASSERT_WITH_SECURITY_IMPLICATION(index < m_dirEntries.size());
336 const uint32_t imageOffset = m_dirEntries[index].m_imageOffset; 336 const uint32_t imageOffset = m_dirEntries[index].m_imageOffset;
337 if ((imageOffset > m_data->size()) || ((m_data->size() - imageOffset) < 4)) 337 if ((imageOffset > m_data->size()) || ((m_data->size() - imageOffset) < 4))
338 return Unknown; 338 return Unknown;
339 return strncmp(&m_data->data()[imageOffset], "\x89PNG", 4) ? BMP : PNG; 339 return strncmp(&m_data->data()[imageOffset], "\x89PNG", 4) ? BMP : PNG;
340 } 340 }
341 341
342 } 342 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698