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

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

Issue 2700123003: DO NOT COMMIT: Results of running old (current) clang-format on Blink (Closed)
Patch Set: Created 3 years, 10 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 12 matching lines...) Expand all
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 "platform/image-decoders/ico/ICOImageDecoder.h" 31 #include "platform/image-decoders/ico/ICOImageDecoder.h"
32 32
33 #include <algorithm>
33 #include "platform/image-decoders/png/PNGImageDecoder.h" 34 #include "platform/image-decoders/png/PNGImageDecoder.h"
34 #include "wtf/PtrUtil.h" 35 #include "wtf/PtrUtil.h"
35 #include <algorithm>
36 36
37 namespace blink { 37 namespace blink {
38 38
39 // Number of bits in .ICO/.CUR used to store the directory and its entries, 39 // Number of bits in .ICO/.CUR used to store the directory and its entries,
40 // respectively (doesn't match sizeof values for member structs since we omit 40 // respectively (doesn't match sizeof values for member structs since we omit
41 // some fields). 41 // some fields).
42 static const size_t sizeOfDirectory = 6; 42 static const size_t sizeOfDirectory = 6;
43 static const size_t sizeOfDirEntry = 16; 43 static const size_t sizeOfDirEntry = 16;
44 44
45 ICOImageDecoder::ICOImageDecoder(AlphaOption alphaOption, 45 ICOImageDecoder::ICOImageDecoder(AlphaOption alphaOption,
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 SECURITY_DCHECK(index < m_dirEntries.size()); 325 SECURITY_DCHECK(index < m_dirEntries.size());
326 const uint32_t imageOffset = m_dirEntries[index].m_imageOffset; 326 const uint32_t imageOffset = m_dirEntries[index].m_imageOffset;
327 if ((imageOffset > m_data->size()) || ((m_data->size() - imageOffset) < 4)) 327 if ((imageOffset > m_data->size()) || ((m_data->size() - imageOffset) < 4))
328 return Unknown; 328 return Unknown;
329 char buffer[4]; 329 char buffer[4];
330 const char* data = m_fastReader.getConsecutiveData(imageOffset, 4, buffer); 330 const char* data = m_fastReader.getConsecutiveData(imageOffset, 4, buffer);
331 return strncmp(data, "\x89PNG", 4) ? BMP : PNG; 331 return strncmp(data, "\x89PNG", 4) ? BMP : PNG;
332 } 332 }
333 333
334 } // namespace blink 334 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698