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

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

Issue 1962563002: Fix ImageDecoder::frameIsCompleteAtIndex - fully received instead of decoded. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 public: 42 public:
43 GIFImageDecoder(AlphaOption, GammaAndColorProfileOption, size_t maxDecodedBy tes); 43 GIFImageDecoder(AlphaOption, GammaAndColorProfileOption, size_t maxDecodedBy tes);
44 ~GIFImageDecoder() override; 44 ~GIFImageDecoder() override;
45 45
46 enum GIFParseQuery { GIFSizeQuery, GIFFrameCountQuery }; 46 enum GIFParseQuery { GIFSizeQuery, GIFFrameCountQuery };
47 47
48 // ImageDecoder: 48 // ImageDecoder:
49 String filenameExtension() const override { return "gif"; } 49 String filenameExtension() const override { return "gif"; }
50 void onSetData(SegmentReader* data) override; 50 void onSetData(SegmentReader* data) override;
51 int repetitionCount() const override; 51 int repetitionCount() const override;
52 bool frameIsCompleteAtIndex(size_t) const override; 52 bool frameIsFullyReceivedAtIndex(size_t) const override;
53 float frameDurationAtIndex(size_t) const override; 53 float frameDurationAtIndex(size_t) const override;
54 size_t clearCacheExceptFrame(size_t) override; 54 size_t clearCacheExceptFrame(size_t) override;
55 // CAUTION: setFailed() deletes |m_reader|. Be careful to avoid 55 // CAUTION: setFailed() deletes |m_reader|. Be careful to avoid
56 // accessing deleted memory, especially when calling this from inside 56 // accessing deleted memory, especially when calling this from inside
57 // GIFImageReader! 57 // GIFImageReader!
58 bool setFailed() override; 58 bool setFailed() override;
59 59
60 // Callbacks from the GIF reader. 60 // Callbacks from the GIF reader.
61 bool haveDecodedRow(size_t frameIndex, GIFRow::const_iterator rowBegin, size _t width, size_t rowNumber, unsigned repeatCount, bool writeTransparentPixels); 61 bool haveDecodedRow(size_t frameIndex, GIFRow::const_iterator rowBegin, size _t width, size_t rowNumber, unsigned repeatCount, bool writeTransparentPixels);
62 bool frameComplete(size_t frameIndex); 62 bool frameComplete(size_t frameIndex);
63 63
64 // For testing. 64 // For testing.
65 bool parseCompleted() const; 65 bool parseCompleted() const;
66 66
67 private: 67 private:
68 // ImageDecoder: 68 // ImageDecoder:
69 void clearFrameBuffer(size_t frameIndex) override; 69 void clearFrameBuffer(size_t frameIndex) override;
70 virtual void decodeSize() { parse(GIFSizeQuery); } 70 void decodeSize() override { parse(GIFSizeQuery); }
71 size_t decodeFrameCount() override; 71 size_t decodeFrameCount() override;
72 void initializeNewFrame(size_t) override; 72 void initializeNewFrame(size_t) override;
73 void decode(size_t) override; 73 void decode(size_t) override;
74 74
75 // Parses as much as is needed to answer the query, ignoring bitmap 75 // Parses as much as is needed to answer the query, ignoring bitmap
76 // data. If parsing fails, sets the "decode failure" flag. 76 // data. If parsing fails, sets the "decode failure" flag.
77 void parse(GIFParseQuery); 77 void parse(GIFParseQuery);
78 78
79 // Called to initialize the frame buffer with the given index, based on 79 // Called to initialize the frame buffer with the given index, based on
80 // the previous frame's disposal method. Returns true on success. On 80 // the previous frame's disposal method. Returns true on success. On
81 // failure, this will mark the image as failed. 81 // failure, this will mark the image as failed.
82 bool initFrameBuffer(size_t frameIndex); 82 bool initFrameBuffer(size_t frameIndex);
83 83
84 // Like clearCacheExceptFrame(), but preserves two frames instead of one. 84 // Like clearCacheExceptFrame(), but preserves two frames instead of one.
85 size_t clearCacheExceptTwoFrames(size_t, size_t); 85 size_t clearCacheExceptTwoFrames(size_t, size_t);
86 86
87 bool m_currentBufferSawAlpha; 87 bool m_currentBufferSawAlpha;
88 mutable int m_repetitionCount; 88 mutable int m_repetitionCount;
89 OwnPtr<GIFImageReader> m_reader; 89 OwnPtr<GIFImageReader> m_reader;
90 }; 90 };
91 91
92 } // namespace blink 92 } // namespace blink
93 93
94 #endif 94 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698