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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef PNGImageDecoder_h 26 #ifndef PNGImageDecoder_h
27 #define PNGImageDecoder_h 27 #define PNGImageDecoder_h
28 28
29 #include "platform/image-decoders/ImageDecoder.h" 29 #include "platform/image-decoders/ImageDecoder.h"
30 #include <memory>
30 31
31 namespace blink { 32 namespace blink {
32 33
33 class PNGImageReader; 34 class PNGImageReader;
34 35
35 class PLATFORM_EXPORT PNGImageDecoder final : public ImageDecoder { 36 class PLATFORM_EXPORT PNGImageDecoder final : public ImageDecoder {
36 WTF_MAKE_NONCOPYABLE(PNGImageDecoder); 37 WTF_MAKE_NONCOPYABLE(PNGImageDecoder);
37 public: 38 public:
38 PNGImageDecoder(AlphaOption, GammaAndColorProfileOption, size_t maxDecodedBy tes, size_t offset = 0); 39 PNGImageDecoder(AlphaOption, GammaAndColorProfileOption, size_t maxDecodedBy tes, size_t offset = 0);
39 ~PNGImageDecoder() override; 40 ~PNGImageDecoder() override;
40 41
41 // ImageDecoder: 42 // ImageDecoder:
42 String filenameExtension() const override { return "png"; } 43 String filenameExtension() const override { return "png"; }
43 44
44 // Callbacks from libpng 45 // Callbacks from libpng
45 void headerAvailable(); 46 void headerAvailable();
46 void rowAvailable(unsigned char* row, unsigned rowIndex, int); 47 void rowAvailable(unsigned char* row, unsigned rowIndex, int);
47 void complete(); 48 void complete();
48 49
49 private: 50 private:
50 // ImageDecoder: 51 // ImageDecoder:
51 void decodeSize() override { decode(true); } 52 void decodeSize() override { decode(true); }
52 void decode(size_t) override { decode(false); } 53 void decode(size_t) override { decode(false); }
53 54
54 // Decodes the image. If |onlySize| is true, stops decoding after 55 // Decodes the image. If |onlySize| is true, stops decoding after
55 // 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
56 // data coming, sets the "decode failure" flag. 57 // data coming, sets the "decode failure" flag.
57 void decode(bool onlySize); 58 void decode(bool onlySize);
58 59
59 OwnPtr<PNGImageReader> m_reader; 60 std::unique_ptr<PNGImageReader> m_reader;
60 const unsigned m_offset; 61 const unsigned m_offset;
61 }; 62 };
62 63
63 } // namespace blink 64 } // namespace blink
64 65
65 #endif 66 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698