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

Side by Side Diff: third_party/WebKit/Source/platform/image-decoders/ImageDecoder.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) Research In Motion Limited 2009-2010. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 * 18 *
19 */ 19 */
20 20
21 #include "platform/image-decoders/ImageDecoder.h" 21 #include "platform/image-decoders/ImageDecoder.h"
22 22
23 #include <memory>
23 #include "platform/PlatformInstrumentation.h" 24 #include "platform/PlatformInstrumentation.h"
24 #include "platform/RuntimeEnabledFeatures.h" 25 #include "platform/RuntimeEnabledFeatures.h"
25 #include "platform/graphics/BitmapImageMetrics.h" 26 #include "platform/graphics/BitmapImageMetrics.h"
26 #include "platform/image-decoders/FastSharedBufferReader.h" 27 #include "platform/image-decoders/FastSharedBufferReader.h"
27 #include "platform/image-decoders/bmp/BMPImageDecoder.h" 28 #include "platform/image-decoders/bmp/BMPImageDecoder.h"
28 #include "platform/image-decoders/gif/GIFImageDecoder.h" 29 #include "platform/image-decoders/gif/GIFImageDecoder.h"
29 #include "platform/image-decoders/ico/ICOImageDecoder.h" 30 #include "platform/image-decoders/ico/ICOImageDecoder.h"
30 #include "platform/image-decoders/jpeg/JPEGImageDecoder.h" 31 #include "platform/image-decoders/jpeg/JPEGImageDecoder.h"
31 #include "platform/image-decoders/png/PNGImageDecoder.h" 32 #include "platform/image-decoders/png/PNGImageDecoder.h"
32 #include "platform/image-decoders/webp/WEBPImageDecoder.h" 33 #include "platform/image-decoders/webp/WEBPImageDecoder.h"
33 #include "wtf/PtrUtil.h" 34 #include "wtf/PtrUtil.h"
34 #include <memory>
35 35
36 namespace blink { 36 namespace blink {
37 37
38 inline bool matchesJPEGSignature(const char* contents) { 38 inline bool matchesJPEGSignature(const char* contents) {
39 return !memcmp(contents, "\xFF\xD8\xFF", 3); 39 return !memcmp(contents, "\xFF\xD8\xFF", 3);
40 } 40 }
41 41
42 inline bool matchesPNGSignature(const char* contents) { 42 inline bool matchesPNGSignature(const char* contents) {
43 return !memcmp(contents, "\x89PNG\r\n\x1A\n", 8); 43 return !memcmp(contents, "\x89PNG\r\n\x1A\n", 8);
44 } 44 }
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 sk_sp<SkColorSpace> ImageDecoder::colorSpaceForSkImages() const { 544 sk_sp<SkColorSpace> ImageDecoder::colorSpaceForSkImages() const {
545 if (!m_colorBehavior.isTag()) 545 if (!m_colorBehavior.isTag())
546 return nullptr; 546 return nullptr;
547 547
548 if (m_embeddedColorSpace) 548 if (m_embeddedColorSpace)
549 return m_embeddedColorSpace; 549 return m_embeddedColorSpace;
550 return SkColorSpace::MakeSRGB(); 550 return SkColorSpace::MakeSRGB();
551 } 551 }
552 552
553 } // namespace blink 553 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698