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

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

Issue 2386453003: WIP: Implement APNG (Closed)
Patch Set: Fixed feedback on patch 8 Created 4 years, 1 month 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 21 matching lines...) Expand all
32 namespace blink { 32 namespace blink {
33 33
34 class PNGImageReader; 34 class PNGImageReader;
35 35
36 class PLATFORM_EXPORT PNGImageDecoder final : public ImageDecoder { 36 class PLATFORM_EXPORT PNGImageDecoder final : public ImageDecoder {
37 WTF_MAKE_NONCOPYABLE(PNGImageDecoder); 37 WTF_MAKE_NONCOPYABLE(PNGImageDecoder);
38 public: 38 public:
39 PNGImageDecoder(AlphaOption, GammaAndColorProfileOption, size_t maxDecodedBy tes, size_t offset = 0); 39 PNGImageDecoder(AlphaOption, GammaAndColorProfileOption, size_t maxDecodedBy tes, size_t offset = 0);
40 ~PNGImageDecoder() override; 40 ~PNGImageDecoder() override;
41 41
42 enum class PNGParseQuery { PNGSizeQuery, PNGMetaDataQuery };
43
42 // ImageDecoder: 44 // ImageDecoder:
43 String filenameExtension() const override { return "png"; } 45 String filenameExtension() const override { return "png"; }
46 int repetitionCount() const override;
47 bool frameIsCompleteAtIndex(size_t) const override;
48 float frameDurationAtIndex(size_t) const override;
44 49
45 // Callbacks from libpng 50 // Callbacks from libpng
46 void headerAvailable(); 51 void headerAvailable();
47 void rowAvailable(unsigned char* row, unsigned rowIndex, int); 52 void rowAvailable(unsigned char* row, unsigned rowIndex, int);
48 void complete(); 53 void complete();
49 54
55 // Additional methods used for APNG
56 void setRepetitionCount(size_t);
57 // This is called by PNGImageReader when it encounters the IEND chunk
58 // while parsing PNGMetaDataQuery. If m_metaDataDecoded is true, the decoder
59 // does not need to query for meta data again.
60 void setMetaDataDecoded() { m_metaDataDecoded = true; };
61
50 private: 62 private:
51 // ImageDecoder: 63 // ImageDecoder:
52 void decodeSize() override { decode(true); } 64 void decodeSize() override { parse(PNGParseQuery::PNGSizeQuery); }
53 void decode(size_t) override { decode(false); } 65 void decode(size_t) override;
66 size_t decodeFrameCount() override;
67 void initializeNewFrame(size_t) override;
54 68
55 // Decodes the image. If |onlySize| is true, stops decoding after 69 void parse(PNGParseQuery);
56 // calculating the image size. If decoding fails but there is no more
57 // data coming, sets the "decode failure" flag.
58 void decode(bool onlySize);
59 70
60 std::unique_ptr<PNGImageReader> m_reader; 71 std::unique_ptr<PNGImageReader> m_reader;
61 const unsigned m_offset; 72 const unsigned m_offset;
73 bool m_metaDataDecoded;
74 size_t m_frameCount;
75 size_t m_currentFrame;
76 // m_repetitionCount is set to cAnimationLoopOnce by default, so the
77 // DeferredImageDecoder takes into account that this may be an animated
78 // image, but we don't know for sure yet.
79 int m_repetitionCount;
62 }; 80 };
63 81
64 } // namespace blink 82 } // namespace blink
65 83
66 #endif 84 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698