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

Side by Side Diff: third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoder.h

Issue 2565323003: Move gif image decoder to SkCodec (Closed)
Patch Set: Adding SegmentStreamTest.cpp, more null checks, and updating m_hasReadAllContents more. Created 3 years, 8 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 GIFImageDecoder_h 26 #ifndef GIFImageDecoder_h
27 #define GIFImageDecoder_h 27 #define GIFImageDecoder_h
28 28
29 #include <memory>
29 #include "platform/image-decoders/ImageDecoder.h" 30 #include "platform/image-decoders/ImageDecoder.h"
31 #include "platform/image-decoders/SegmentStream.h"
32 #include "third_party/skia/include/codec/SkCodec.h"
30 #include "wtf/Noncopyable.h" 33 #include "wtf/Noncopyable.h"
31 #include <memory> 34 #include "wtf/RefPtr.h"
32
33 class GIFImageReader;
34
35 typedef Vector<unsigned char> GIFRow;
36 35
37 namespace blink { 36 namespace blink {
38 37
39 // This class decodes the GIF image format. 38 // This class decodes the GIF image format.
40 class PLATFORM_EXPORT GIFImageDecoder final : public ImageDecoder { 39 class PLATFORM_EXPORT GIFImageDecoder final : public ImageDecoder {
41 WTF_MAKE_NONCOPYABLE(GIFImageDecoder); 40 WTF_MAKE_NONCOPYABLE(GIFImageDecoder);
42 41
43 public: 42 public:
44 GIFImageDecoder(AlphaOption, const ColorBehavior&, size_t maxDecodedBytes); 43 GIFImageDecoder(AlphaOption, const ColorBehavior&, size_t maxDecodedBytes);
45 ~GIFImageDecoder() override; 44 ~GIFImageDecoder() override;
46 45
47 enum GIFParseQuery { GIFSizeQuery, GIFFrameCountQuery };
48
49 // ImageDecoder: 46 // ImageDecoder:
50 String filenameExtension() const override { return "gif"; } 47 String filenameExtension() const override { return "gif"; }
51 void onSetData(SegmentReader* data) override; 48 void onSetData(SegmentReader* data) override;
52 int repetitionCount() const override; 49 int repetitionCount() const override;
53 bool frameIsCompleteAtIndex(size_t) const override; 50 bool frameIsCompleteAtIndex(size_t) const override;
54 float frameDurationAtIndex(size_t) const override; 51 float frameDurationAtIndex(size_t) const override;
55 // CAUTION: setFailed() deletes |m_reader|. Be careful to avoid
56 // accessing deleted memory, especially when calling this from inside
57 // GIFImageReader!
58 bool setFailed() override;
59
60 // Callbacks from the GIF reader.
61 bool haveDecodedRow(size_t frameIndex,
62 GIFRow::const_iterator rowBegin,
63 size_t width,
64 size_t rowNumber,
65 unsigned repeatCount,
66 bool writeTransparentPixels);
67 bool frameComplete(size_t frameIndex);
68
69 // For testing.
70 bool parseCompleted() const;
71 52
72 private: 53 private:
73 // ImageDecoder: 54 // ImageDecoder:
74 void clearFrameBuffer(size_t frameIndex) override; 55 void decodeSize() override {}
75 virtual void decodeSize() { parse(GIFSizeQuery); }
76 size_t decodeFrameCount() override; 56 size_t decodeFrameCount() override;
77 void initializeNewFrame(size_t) override; 57 void initializeNewFrame(size_t index) override;
78 void decode(size_t) override; 58 void decode(size_t) override;
79 59 bool frameStatusSufficientForSuccessors(size_t index) {
80 // Parses as much as is needed to answer the query, ignoring bitmap 60 DCHECK(index < m_frameBufferCache.size());
81 // data. If parsing fails, sets the "decode failure" flag. 61 return m_frameBufferCache[index].getStatus() == ImageFrame::FrameComplete;
82 void parse(GIFParseQuery); 62 }
83
84 // Reset the alpha tracker for this frame. Before calling this method, the
85 // caller must verify that the frame exists.
86 void onInitFrameBuffer(size_t) override;
87
88 // When the disposal method of the frame is DisposeOverWritePrevious, the 63 // When the disposal method of the frame is DisposeOverWritePrevious, the
89 // next frame will use the previous frame's buffer as its starting state, so 64 // next frame will use the previous frame's buffer as its starting state, so
90 // we can't take over the data in that case. Before calling this method, the 65 // we can't take over the data in that case. Before calling this method, the
91 // caller must verify that the frame exists. 66 // caller must verify that the frame exists.
92 bool canReusePreviousFrameBuffer(size_t) const override; 67 bool canReusePreviousFrameBuffer(size_t) const override;
93 68
94 bool m_currentBufferSawAlpha; 69 std::unique_ptr<SkCodec> m_codec;
95 mutable int m_repetitionCount; 70 // m_segmentStream is a raw pointer because it passes ownership to
96 std::unique_ptr<GIFImageReader> m_reader; 71 // m_codec when m_codec is created. However, we still need the
72 // pointer so we can append more data as it arrives.
73 SegmentStream* m_segmentStream;
74 std::vector<SkCodec::FrameInfo> m_frameInfos;
97 }; 75 };
98 76
99 } // namespace blink 77 } // namespace blink
100 78
101 #endif 79 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698