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

Side by Side Diff: sky/engine/platform/image-decoders/ico/ICOImageDecoder.cpp

Issue 1206763002: Really remove config.h (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 5 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 10 matching lines...) Expand all
21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
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 "sky/engine/config.h"
32 #include "platform/image-decoders/ico/ICOImageDecoder.h" 31 #include "platform/image-decoders/ico/ICOImageDecoder.h"
33 32
34 #include <algorithm> 33 #include <algorithm>
35 34
36 #include "platform/image-decoders/png/PNGImageDecoder.h" 35 #include "platform/image-decoders/png/PNGImageDecoder.h"
37 #include "sky/engine/wtf/PassOwnPtr.h" 36 #include "sky/engine/wtf/PassOwnPtr.h"
38 37
39 namespace blink { 38 namespace blink {
40 39
41 // Number of bits in .ICO/.CUR used to store the directory and its entries, 40 // Number of bits in .ICO/.CUR used to store the directory and its entries,
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 // 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
335 // number. 334 // number.
336 ASSERT_WITH_SECURITY_IMPLICATION(index < m_dirEntries.size()); 335 ASSERT_WITH_SECURITY_IMPLICATION(index < m_dirEntries.size());
337 const uint32_t imageOffset = m_dirEntries[index].m_imageOffset; 336 const uint32_t imageOffset = m_dirEntries[index].m_imageOffset;
338 if ((imageOffset > m_data->size()) || ((m_data->size() - imageOffset) < 4)) 337 if ((imageOffset > m_data->size()) || ((m_data->size() - imageOffset) < 4))
339 return Unknown; 338 return Unknown;
340 return strncmp(&m_data->data()[imageOffset], "\x89PNG", 4) ? BMP : PNG; 339 return strncmp(&m_data->data()[imageOffset], "\x89PNG", 4) ? BMP : PNG;
341 } 340 }
342 341
343 } 342 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698