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

Side by Side Diff: third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.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 JPEGImageDecoder_h 26 #ifndef JPEGImageDecoder_h
27 #define JPEGImageDecoder_h 27 #define JPEGImageDecoder_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 JPEGImageReader; 34 class JPEGImageReader;
34 35
35 class PLATFORM_EXPORT JPEGImageDecoder final : public ImageDecoder { 36 class PLATFORM_EXPORT JPEGImageDecoder final : public ImageDecoder {
36 WTF_MAKE_NONCOPYABLE(JPEGImageDecoder); 37 WTF_MAKE_NONCOPYABLE(JPEGImageDecoder);
37 public: 38 public:
38 JPEGImageDecoder(AlphaOption, GammaAndColorProfileOption, size_t maxDecodedB ytes); 39 JPEGImageDecoder(AlphaOption, GammaAndColorProfileOption, size_t maxDecodedB ytes);
39 ~JPEGImageDecoder() override; 40 ~JPEGImageDecoder() override;
40 41
41 // ImageDecoder: 42 // ImageDecoder:
42 String filenameExtension() const override { return "jpg"; } 43 String filenameExtension() const override { return "jpg"; }
43 void onSetData(SegmentReader* data) override; 44 void onSetData(SegmentReader* data) override;
44 IntSize decodedSize() const override { return m_decodedSize; } 45 IntSize decodedSize() const override { return m_decodedSize; }
45 bool setSize(unsigned width, unsigned height) override; 46 bool setSize(unsigned width, unsigned height) override;
46 IntSize decodedYUVSize(int component) const override; 47 IntSize decodedYUVSize(int component) const override;
47 size_t decodedYUVWidthBytes(int component) const override; 48 size_t decodedYUVWidthBytes(int component) const override;
48 bool canDecodeToYUV() override; 49 bool canDecodeToYUV() override;
49 bool decodeToYUV() override; 50 bool decodeToYUV() override;
50 void setImagePlanes(PassOwnPtr<ImagePlanes>) override; 51 void setImagePlanes(std::unique_ptr<ImagePlanes>) override;
51 bool hasImagePlanes() const { return m_imagePlanes.get(); } 52 bool hasImagePlanes() const { return m_imagePlanes.get(); }
52 53
53 bool outputScanlines(); 54 bool outputScanlines();
54 unsigned desiredScaleNumerator() const; 55 unsigned desiredScaleNumerator() const;
55 void complete(); 56 void complete();
56 57
57 void setOrientation(ImageOrientation orientation) { m_orientation = orientat ion; } 58 void setOrientation(ImageOrientation orientation) { m_orientation = orientat ion; }
58 void setDecodedSize(unsigned width, unsigned height); 59 void setDecodedSize(unsigned width, unsigned height);
59 60
60 private: 61 private:
61 // ImageDecoder: 62 // ImageDecoder:
62 void decodeSize() override { decode(true); } 63 void decodeSize() override { decode(true); }
63 void decode(size_t) override { decode(false); } 64 void decode(size_t) override { decode(false); }
64 65
65 // Decodes the image. If |onlySize| is true, stops decoding after 66 // Decodes the image. If |onlySize| is true, stops decoding after
66 // calculating the image size. If decoding fails but there is no more 67 // calculating the image size. If decoding fails but there is no more
67 // data coming, sets the "decode failure" flag. 68 // data coming, sets the "decode failure" flag.
68 void decode(bool onlySize); 69 void decode(bool onlySize);
69 70
70 OwnPtr<JPEGImageReader> m_reader; 71 std::unique_ptr<JPEGImageReader> m_reader;
71 OwnPtr<ImagePlanes> m_imagePlanes; 72 std::unique_ptr<ImagePlanes> m_imagePlanes;
72 IntSize m_decodedSize; 73 IntSize m_decodedSize;
73 }; 74 };
74 75
75 } // namespace blink 76 } // namespace blink
76 77
77 #endif 78 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698