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

Side by Side Diff: third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.h

Issue 1571233003: Fix errors caused by unsafe conversions to/from size_t (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: improved ALLOW_NUMERIC_ARG_TYPES_PROMOTABLE_TO Created 4 years, 11 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) 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2006 Apple Computer, 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 17 matching lines...) Expand all
28 28
29 #include "platform/image-decoders/ImageDecoder.h" 29 #include "platform/image-decoders/ImageDecoder.h"
30 30
31 namespace blink { 31 namespace blink {
32 32
33 class PNGImageReader; 33 class PNGImageReader;
34 34
35 class PLATFORM_EXPORT PNGImageDecoder final : public ImageDecoder { 35 class PLATFORM_EXPORT PNGImageDecoder final : public ImageDecoder {
36 WTF_MAKE_NONCOPYABLE(PNGImageDecoder); 36 WTF_MAKE_NONCOPYABLE(PNGImageDecoder);
37 public: 37 public:
38 PNGImageDecoder(AlphaOption, GammaAndColorProfileOption, size_t maxDecodedBy tes, unsigned offset = 0); 38 PNGImageDecoder(AlphaOption, GammaAndColorProfileOption, size_t maxDecodedBy tes, size_t offset = 0);
39 ~PNGImageDecoder() override; 39 ~PNGImageDecoder() override;
40 40
41 // ImageDecoder: 41 // ImageDecoder:
42 String filenameExtension() const override { return "png"; } 42 String filenameExtension() const override { return "png"; }
43 bool hasColorProfile() const override { return m_hasColorProfile; } 43 bool hasColorProfile() const override { return m_hasColorProfile; }
44 44
45 // Callbacks from libpng 45 // Callbacks from libpng
46 void headerAvailable(); 46 void headerAvailable();
47 void rowAvailable(unsigned char* row, unsigned rowIndex, int); 47 void rowAvailable(unsigned char* row, unsigned rowIndex, int);
48 void complete(); 48 void complete();
49 49
50 private: 50 private:
51 // ImageDecoder: 51 // ImageDecoder:
52 void decodeSize() override { decode(true); } 52 void decodeSize() override { decode(true); }
53 void decode(size_t) override { decode(false); } 53 void decode(size_t) override { decode(false); }
54 54
55 // Decodes the image. If |onlySize| is true, stops decoding after 55 // Decodes the image. If |onlySize| is true, stops decoding after
56 // calculating the image size. If decoding fails but there is no more 56 // calculating the image size. If decoding fails but there is no more
57 // data coming, sets the "decode failure" flag. 57 // data coming, sets the "decode failure" flag.
58 void decode(bool onlySize); 58 void decode(bool onlySize);
59 59
60 OwnPtr<PNGImageReader> m_reader; 60 OwnPtr<PNGImageReader> m_reader;
61 bool m_hasColorProfile; 61 bool m_hasColorProfile;
62 const unsigned m_offset; 62 const unsigned m_offset;
63 }; 63 };
64 64
65 } // namespace blink 65 } // namespace blink
66 66
67 #endif 67 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698