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

Side by Side Diff: third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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) 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 14 matching lines...) Expand all
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 #ifndef BMPImageDecoder_h 31 #ifndef BMPImageDecoder_h
32 #define BMPImageDecoder_h 32 #define BMPImageDecoder_h
33 33
34 #include "platform/image-decoders/bmp/BMPImageReader.h" 34 #include "platform/image-decoders/bmp/BMPImageReader.h"
35 #include <memory> 35 #include "wtf/OwnPtr.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 // This class decodes the BMP image format. 39 // This class decodes the BMP image format.
40 class PLATFORM_EXPORT BMPImageDecoder final : public ImageDecoder { 40 class PLATFORM_EXPORT BMPImageDecoder final : public ImageDecoder {
41 public: 41 public:
42 BMPImageDecoder(AlphaOption, GammaAndColorProfileOption, size_t maxDecodedBy tes); 42 BMPImageDecoder(AlphaOption, GammaAndColorProfileOption, size_t maxDecodedBy tes);
43 43
44 // ImageDecoder: 44 // ImageDecoder:
45 String filenameExtension() const override { return "bmp"; } 45 String filenameExtension() const override { return "bmp"; }
(...skipping 21 matching lines...) Expand all
67 // |imgDataOffset| based on the header contents. Returns true if the 67 // |imgDataOffset| based on the header contents. Returns true if the
68 // file header could be decoded. 68 // file header could be decoded.
69 bool processFileHeader(size_t& imgDataOffset); 69 bool processFileHeader(size_t& imgDataOffset);
70 70
71 // An index into |m_data| representing how much we've already decoded. 71 // An index into |m_data| representing how much we've already decoded.
72 // Note that this only tracks data _this_ class decodes; once the 72 // Note that this only tracks data _this_ class decodes; once the
73 // BMPImageReader takes over this will not be updated further. 73 // BMPImageReader takes over this will not be updated further.
74 size_t m_decodedOffset; 74 size_t m_decodedOffset;
75 75
76 // The reader used to do most of the BMP decoding. 76 // The reader used to do most of the BMP decoding.
77 std::unique_ptr<BMPImageReader> m_reader; 77 OwnPtr<BMPImageReader> m_reader;
78 }; 78 };
79 79
80 } // namespace blink 80 } // namespace blink
81 81
82 #endif 82 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698