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

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

Issue 2565323003: Move gif image decoder to SkCodec (Closed)
Patch Set: Check if the stream has been cleared before any SkCodec call which might advance. Remove dtor which… Created 3 years, 5 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 #include "platform/image-decoders/gif/GIFImageDecoder.h" 26 #include "platform/image-decoders/gif/GIFImageDecoder.h"
27 27
28 #include <limits> 28 #include <limits>
29 #include "platform/image-decoders/gif/GIFImageReader.h"
30 #include "platform/wtf/NotFound.h" 29 #include "platform/wtf/NotFound.h"
31 #include "platform/wtf/PtrUtil.h" 30 #include "platform/wtf/PtrUtil.h"
31 #include "third_party/skia/include/core/SkImageInfo.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 GIFImageDecoder::GIFImageDecoder(AlphaOption alpha_option, 35 GIFImageDecoder::GIFImageDecoder(AlphaOption alpha_option,
36 const ColorBehavior& color_behavior, 36 const ColorBehavior& color_behavior,
37 size_t max_decoded_bytes) 37 size_t max_decoded_bytes)
38 : ImageDecoder(alpha_option, color_behavior, max_decoded_bytes), 38 : ImageDecoder(alpha_option, color_behavior, max_decoded_bytes),
39 repetition_count_(kAnimationLoopOnce) {} 39 codec_(),
40 40 segment_stream_(nullptr) {}
41 GIFImageDecoder::~GIFImageDecoder() {}
42 41
43 void GIFImageDecoder::OnSetData(SegmentReader* data) { 42 void GIFImageDecoder::OnSetData(SegmentReader* data) {
44 if (reader_) 43 if (!data) {
45 reader_->SetData(data); 44 if (segment_stream_)
45 segment_stream_->SetReader(nullptr);
46 return;
47 }
48
49 if (!segment_stream_)
50 segment_stream_ = new SegmentStream();
51
52 segment_stream_->SetReader(PassRefPtr<SegmentReader>(data));
53
54 if (!codec_) {
55 SkCodec::Result stream_creation_result;
56 codec_.reset(SkCodec::NewFromStream(segment_stream_,
57 &stream_creation_result, nullptr));
58 switch (stream_creation_result) {
59 case SkCodec::kSuccess: {
60 // SkCodec::NewFromStream will read enough of the image to get the image
61 // size.
62 SkImageInfo image_info = codec_->getInfo();
63 SetSize(image_info.width(), image_info.height());
64 return;
65 }
66 case SkCodec::kIncompleteInput:
67 // |segment_stream_|'s ownership is passed into NewFromStream.
68 // It is deleted if NewFromStream fails.
69 // If NewFromStream fails, we set |segment_stream_| to null so
70 // we aren't pointing to reclaimed memory.
71 segment_stream_ = nullptr;
72 return;
73 default:
74 SetFailed();
75 return;
76 }
77 }
46 } 78 }
47 79
48 int GIFImageDecoder::RepetitionCount() const { 80 int GIFImageDecoder::RepetitionCount() const {
81 if (!codec_ || segment_stream_->IsCleared())
scroggo_chromium 2017/07/21 19:01:41 The fact that segment_stream_ has been cleared doe
cblume 2017/07/21 22:50:00 kAnimationLoopOnce is the value we return when we
82 return kAnimationLoopOnce;
83
84 DCHECK(!Failed());
85
49 // This value can arrive at any point in the image data stream. Most GIFs 86 // This value can arrive at any point in the image data stream. Most GIFs
50 // in the wild declare it near the beginning of the file, so it usually is 87 // in the wild declare it near the beginning of the file, so it usually is
51 // set by the time we've decoded the size, but (depending on the GIF and the 88 // set by the time we've decoded the size, but (depending on the GIF and the
52 // packets sent back by the webserver) not always. If the reader hasn't 89 // packets sent back by the webserver) not always.
53 // seen a loop count yet, it will return kCLoopCountNotSeen, in which case we
54 // should default to looping once (the initial value for
55 // |repetition_count_|).
56 // 90 //
57 // There are some additional wrinkles here. First, ImageSource::Clear() 91 // SkCodec will parse forward in the file if the repetition count has not been
58 // may destroy the reader, making the result from the reader _less_ 92 // seen yet.
59 // authoritative on future calls if the recreated reader hasn't seen the 93 int repetition_count = codec_->getRepetitionCount();
60 // loop count. We don't need to special-case this because in this case the 94
61 // new reader will once again return kCLoopCountNotSeen, and we won't 95 switch (repetition_count) {
62 // overwrite the cached correct value. 96 case 0: {
97 // SkCodec returns 0 for both still images and animated images which only
98 // play once.
99 if (IsAllDataReceived() && codec_->getFrameCount() == 1)
100 return kAnimationNone;
101
102 return kAnimationLoopOnce;
103 }
104 case SkCodec::kRepetitionCountInfinite:
105 return kAnimationLoopInfinite;
106 default:
107 return repetition_count;
108 }
109 }
110
111 bool GIFImageDecoder::FrameIsReceivedAtIndex(size_t index) const {
112 if (!codec_ || segment_stream_->IsCleared())
scroggo_chromium 2017/07/21 19:01:41 I suspect if IsCleared we want to return some sort
cblume 2017/07/24 05:54:47 Done. I am keeping a cached copy and checking if t
scroggo_chromium 2017/07/25 19:02:00 Once it reports the second frame, the first frame
cblume 2017/07/26 07:43:29 Right right. That's not what I mean though. Once t
113 return false;
114
115 if (static_cast<size_t>(codec_->getFrameCount()) <= index)
116 return false;
117
118 SkCodec::FrameInfo frame_info;
119 codec_->getFrameInfo(index, &frame_info);
120 return frame_info.fFullyReceived;
121 }
122
123 float GIFImageDecoder::FrameDurationAtIndex(size_t index) const {
124 if (index < frame_buffer_cache_.size())
125 return frame_buffer_cache_[index].Duration();
126 return 0;
127 }
128
129 bool GIFImageDecoder::SetFailed() {
130 segment_stream_ = nullptr;
131 codec_.reset();
132 return ImageDecoder::SetFailed();
133 }
134
135 size_t GIFImageDecoder::ClearCacheExceptFrame(size_t index) {
136 // SkCodec attempts to report the earliest possible required frame, but it is
137 // possible that frame has been evicted, while a later frame (which could also
138 // be used as the required frame) is still cached. Try to preserve a frame
139 // that is still cached.
140 if (frame_buffer_cache_.size() <= 1)
141 return 0;
142
143 size_t index2 = kNotFound;
144 if (index < frame_buffer_cache_.size()) {
145 const ImageFrame& frame = frame_buffer_cache_[index];
146 if (!FrameStatusSufficientForSuccessors(index) ||
147 frame.GetDisposalMethod() == ImageFrame::kDisposeOverwritePrevious) {
148 index2 = GetViableReferenceFrameIndex(index);
149 }
150 }
151
152 return ClearCacheExceptTwoFrames(index, index2);
153 }
154
155 size_t GIFImageDecoder::DecodeFrameCount() {
156 if (!codec_ || segment_stream_->IsCleared())
157 return frame_buffer_cache_.size();
158
159 return codec_->getFrameCount();
160 }
161
162 void GIFImageDecoder::InitializeNewFrame(size_t index) {
163 DCHECK(codec_);
164
165 ImageFrame& frame = frame_buffer_cache_[index];
166 // SkCodec does not inform us if only a portion of the image was updated
167 // in the current frame. Because of this, rather than correctly filling in
168 // the frame rect, we set the frame rect to be the image's full size.
169 // The original frame rect is not used, anyway.
170 IntSize full_image_size = Size();
171 frame.SetOriginalFrameRect(IntRect(IntPoint(), full_image_size));
172
173 SkCodec::FrameInfo frame_info;
174 bool frame_info_received = codec_->getFrameInfo(index, &frame_info);
175 DCHECK(frame_info_received);
176 frame.SetDuration(frame_info.fDuration);
177 size_t required_previous_frame_index;
178 if (frame_info.fRequiredFrame == SkCodec::kNone) {
179 required_previous_frame_index = kNotFound;
180 } else {
181 required_previous_frame_index =
182 static_cast<size_t>(frame_info.fRequiredFrame);
183 }
184 frame.SetRequiredPreviousFrameIndex(required_previous_frame_index);
185
186 ImageFrame::DisposalMethod disposal_method = ImageFrame::kDisposeNotSpecified;
187 switch (frame_info.fDisposalMethod) {
188 case SkCodecAnimation::DisposalMethod::kKeep:
189 disposal_method = ImageFrame::kDisposeKeep;
190 break;
191 case SkCodecAnimation::DisposalMethod::kRestoreBGColor:
192 disposal_method = ImageFrame::kDisposeOverwriteBgcolor;
193 break;
194 case SkCodecAnimation::DisposalMethod::kRestorePrevious:
195 disposal_method = ImageFrame::kDisposeOverwritePrevious;
196 break;
197 }
198 frame.SetDisposalMethod(disposal_method);
199 }
200
201 void GIFImageDecoder::Decode(size_t index) {
202 if (!codec_ || segment_stream_->IsCleared())
scroggo_chromium 2017/07/21 19:01:41 You already check for this on line 209. I think it
cblume 2017/07/21 22:50:00 Done.
203 return;
204
205 DCHECK(!Failed());
206
207 DCHECK_LT(index, frame_buffer_cache_.size());
208
209 if (segment_stream_->IsCleared())
210 return;
211
212 UpdateAggressivePurging(index);
213 SkImageInfo image_info = codec_->getInfo()
214 .makeColorType(kN32_SkColorType)
215 .makeColorSpace(ColorSpaceForSkImages());
216
217 SkCodec::Options options;
218 options.fFrameIndex = index;
219 options.fPriorFrame = SkCodec::kNone;
220 options.fZeroInitialized = SkCodec::kNo_ZeroInitialized;
221
222 ImageFrame& frame = frame_buffer_cache_[index];
223 if (frame.GetStatus() == ImageFrame::kFrameEmpty) {
224 size_t required_previous_frame_index = frame.RequiredPreviousFrameIndex();
225 if (required_previous_frame_index == kNotFound) {
226 frame.AllocatePixelData(Size().Width(), Size().Height(),
227 ColorSpaceForSkImages());
228 frame.ZeroFillPixelData();
229 } else {
230 size_t previous_frame_index = GetViableReferenceFrameIndex(index);
231 if (previous_frame_index == kNotFound) {
232 previous_frame_index = required_previous_frame_index;
233 Decode(previous_frame_index);
234 }
235
236 // We try to reuse |previous_frame| as starting state to avoid copying.
237 // If CanReusePreviousFrameBuffer returns false, we must copy the data
238 // since |previous_frame| is necessary to decode this or later frames.
239 // In that case copy the data instead.
240 ImageFrame& previous_frame = frame_buffer_cache_[previous_frame_index];
241 if ((!CanReusePreviousFrameBuffer(index) ||
242 !frame.TakeBitmapDataIfWritable(&previous_frame)) &&
243 !frame.CopyBitmapData(previous_frame)) {
244 SetFailed();
245 return;
246 }
247 options.fPriorFrame = previous_frame_index;
248 }
249 }
250
251 if (frame.GetStatus() == ImageFrame::kFrameAllocated) {
252 SkCodec::Result start_incremental_decode_result =
253 codec_->startIncrementalDecode(image_info, frame.Bitmap().getPixels(),
254 frame.Bitmap().rowBytes(), &options);
255 switch (start_incremental_decode_result) {
256 case SkCodec::kSuccess:
257 break;
258 case SkCodec::kIncompleteInput:
259 return;
260 default:
261 SetFailed();
262 return;
263 }
264 frame.SetStatus(ImageFrame::kFramePartial);
265 }
266
267 SkCodec::Result incremental_decode_result = codec_->incrementalDecode();
268 switch (incremental_decode_result) {
269 case SkCodec::kSuccess: {
270 SkCodec::FrameInfo frame_info;
271 bool frame_info_received = codec_->getFrameInfo(index, &frame_info);
272 DCHECK(frame_info_received);
273 frame.SetHasAlpha(!SkAlphaTypeIsOpaque(frame_info.fAlphaType));
274 frame.SetPixelsChanged(true);
275 frame.SetStatus(ImageFrame::kFrameComplete);
276 PostDecodeProcessing(index);
277 break;
278 }
279 case SkCodec::kIncompleteInput:
280 frame.SetPixelsChanged(true);
281 if (FrameIsReceivedAtIndex(index) || IsAllDataReceived()) {
282 SetFailed();
283 }
284 break;
285 default:
286 SetFailed();
287 break;
288 }
289 }
290
291 bool GIFImageDecoder::CanReusePreviousFrameBuffer(size_t index) const {
292 DCHECK(index < frame_buffer_cache_.size());
293 return frame_buffer_cache_[index].GetDisposalMethod() !=
294 ImageFrame::kDisposeOverwritePrevious;
295 }
296
297 size_t GIFImageDecoder::GetViableReferenceFrameIndex(
298 size_t dependent_index) const {
299 DCHECK_LT(dependent_index, frame_buffer_cache_.size());
300
301 size_t required_previous_frame_index =
302 frame_buffer_cache_[dependent_index].RequiredPreviousFrameIndex();
303
304 // Any frame in the range [|required_previous_frame_index|, |dependent_index|)
305 // which has a disposal method other than kRestorePrevious can be provided as
306 // the prior frame to SkCodec.
63 // 307 //
64 // Second, a GIF might never set a loop count at all, in which case we 308 // SkCodec sets SkCodec::FrameInfo::fRequiredFrame to the earliest frame which
65 // should continue to treat it as a "loop once" animation. We don't need 309 // can be used. This might come up when several frames update the same
66 // special code here either, because in this case we'll never change 310 // subregion. If that same subregion is about to be overwritten, it doesn't
67 // |repetition_count_| from its default value. 311 // matter which frame in that chain is provided.
68 // 312 size_t previous_reference_frame_index = kNotFound;
69 // Third, we use the same GIFImageReader for counting frames and we might 313 if (required_previous_frame_index != kNotFound) {
70 // see the loop count and then encounter a decoding error which happens 314 // Loop backwards because the frames most likely to be in cache are the most
71 // later in the stream. It is also possible that no frames are in the 315 // recent.
72 // stream. In these cases we should just loop once. 316 for (size_t i = dependent_index - 1; i != required_previous_frame_index;
73 if (IsAllDataReceived() && ParseCompleted() && reader_->ImagesCount() == 1) 317 i--) {
74 repetition_count_ = kAnimationNone; 318 const ImageFrame& frame = frame_buffer_cache_[i];
75 else if (Failed() || (reader_ && (!reader_->ImagesCount()))) 319
76 repetition_count_ = kAnimationLoopOnce; 320 if (frame.GetDisposalMethod() == ImageFrame::kDisposeOverwritePrevious)
77 else if (reader_ && reader_->LoopCount() != kCLoopCountNotSeen) 321 continue;
78 repetition_count_ = reader_->LoopCount(); 322
79 return repetition_count_; 323 if (frame.GetStatus() == ImageFrame::kFrameComplete) {
80 } 324 previous_reference_frame_index = i;
81 325 break;
82 bool GIFImageDecoder::FrameIsReceivedAtIndex(size_t index) const { 326 }
83 return reader_ && (index < reader_->ImagesCount()) && 327 }
84 reader_->FrameContext(index)->IsComplete(); 328 }
85 } 329
86 330 return previous_reference_frame_index;
87 float GIFImageDecoder::FrameDurationAtIndex(size_t index) const {
88 return (reader_ && (index < reader_->ImagesCount()) &&
89 reader_->FrameContext(index)->IsHeaderDefined())
90 ? reader_->FrameContext(index)->DelayTime()
91 : 0;
92 }
93
94 bool GIFImageDecoder::SetFailed() {
95 reader_.reset();
96 return ImageDecoder::SetFailed();
97 }
98
99 bool GIFImageDecoder::HaveDecodedRow(size_t frame_index,
100 GIFRow::const_iterator row_begin,
101 size_t width,
102 size_t row_number,
103 unsigned repeat_count,
104 bool write_transparent_pixels) {
105 const GIFFrameContext* frame_context = reader_->FrameContext(frame_index);
106 // The pixel data and coordinates supplied to us are relative to the frame's
107 // origin within the entire image size, i.e.
108 // (frameC_context->xOffset, frame_context->yOffset). There is no guarantee
109 // that width == (size().width() - frame_context->xOffset), so
110 // we must ensure we don't run off the end of either the source data or the
111 // row's X-coordinates.
112 const int x_begin = frame_context->XOffset();
113 const int y_begin = frame_context->YOffset() + row_number;
114 const int x_end = std::min(static_cast<int>(frame_context->XOffset() + width),
115 Size().Width());
116 const int y_end = std::min(
117 static_cast<int>(frame_context->YOffset() + row_number + repeat_count),
118 Size().Height());
119 if (!width || (x_begin < 0) || (y_begin < 0) || (x_end <= x_begin) ||
120 (y_end <= y_begin))
121 return true;
122
123 const GIFColorMap::Table& color_table =
124 frame_context->LocalColorMap().IsDefined()
125 ? frame_context->LocalColorMap().GetTable()
126 : reader_->GlobalColorMap().GetTable();
127
128 if (color_table.IsEmpty())
129 return true;
130
131 GIFColorMap::Table::const_iterator color_table_iter = color_table.begin();
132
133 // Initialize the frame if necessary.
134 ImageFrame& buffer = frame_buffer_cache_[frame_index];
135 if (!InitFrameBuffer(frame_index))
136 return false;
137
138 const size_t transparent_pixel = frame_context->TransparentPixel();
139 GIFRow::const_iterator row_end = row_begin + (x_end - x_begin);
140 ImageFrame::PixelData* current_address = buffer.GetAddr(x_begin, y_begin);
141
142 // We may or may not need to write transparent pixels to the buffer.
143 // If we're compositing against a previous image, it's wrong, and if
144 // we're writing atop a cleared, fully transparent buffer, it's
145 // unnecessary; but if we're decoding an interlaced gif and
146 // displaying it "Haeberli"-style, we must write these for passes
147 // beyond the first, or the initial passes will "show through" the
148 // later ones.
149 //
150 // The loops below are almost identical. One writes a transparent pixel
151 // and one doesn't based on the value of |write_transparent_pixels|.
152 // The condition check is taken out of the loop to enhance performance.
153 // This optimization reduces decoding time by about 15% for a 3MB image.
154 if (write_transparent_pixels) {
155 for (; row_begin != row_end; ++row_begin, ++current_address) {
156 const size_t source_value = *row_begin;
157 if ((source_value != transparent_pixel) &&
158 (source_value < color_table.size())) {
159 *current_address = color_table_iter[source_value];
160 } else {
161 *current_address = 0;
162 current_buffer_saw_alpha_ = true;
163 }
164 }
165 } else {
166 for (; row_begin != row_end; ++row_begin, ++current_address) {
167 const size_t source_value = *row_begin;
168 if ((source_value != transparent_pixel) &&
169 (source_value < color_table.size()))
170 *current_address = color_table_iter[source_value];
171 else
172 current_buffer_saw_alpha_ = true;
173 }
174 }
175
176 // Tell the frame to copy the row data if need be.
177 if (repeat_count > 1)
178 buffer.CopyRowNTimes(x_begin, x_end, y_begin, y_end);
179
180 buffer.SetPixelsChanged(true);
181 return true;
182 }
183
184 bool GIFImageDecoder::ParseCompleted() const {
185 return reader_ && reader_->ParseCompleted();
186 }
187
188 bool GIFImageDecoder::FrameComplete(size_t frame_index) {
189 // Initialize the frame if necessary. Some GIFs insert do-nothing frames,
190 // in which case we never reach HaveDecodedRow() before getting here.
191 if (!InitFrameBuffer(frame_index))
192 return SetFailed();
193
194 if (!current_buffer_saw_alpha_)
195 CorrectAlphaWhenFrameBufferSawNoAlpha(frame_index);
196
197 frame_buffer_cache_[frame_index].SetStatus(ImageFrame::kFrameComplete);
198
199 return true;
200 }
201
202 void GIFImageDecoder::ClearFrameBuffer(size_t frame_index) {
203 if (reader_ && frame_buffer_cache_[frame_index].GetStatus() ==
204 ImageFrame::kFramePartial) {
205 // Reset the state of the partial frame in the reader so that the frame
206 // can be decoded again when requested.
207 reader_->ClearDecodeState(frame_index);
208 }
209 ImageDecoder::ClearFrameBuffer(frame_index);
210 }
211
212 size_t GIFImageDecoder::DecodeFrameCount() {
213 Parse(kGIFFrameCountQuery);
214 // If decoding fails, |reader_| will have been destroyed. Instead of
215 // returning 0 in this case, return the existing number of frames. This way
216 // if we get halfway through the image before decoding fails, we won't
217 // suddenly start reporting that the image has zero frames.
218 return Failed() ? frame_buffer_cache_.size() : reader_->ImagesCount();
219 }
220
221 void GIFImageDecoder::InitializeNewFrame(size_t index) {
222 ImageFrame* buffer = &frame_buffer_cache_[index];
223 const GIFFrameContext* frame_context = reader_->FrameContext(index);
224 buffer->SetOriginalFrameRect(
225 Intersection(frame_context->FrameRect(), IntRect(IntPoint(), Size())));
226 buffer->SetDuration(frame_context->DelayTime());
227 buffer->SetDisposalMethod(frame_context->GetDisposalMethod());
228 buffer->SetRequiredPreviousFrameIndex(
229 FindRequiredPreviousFrame(index, false));
230 }
231
232 void GIFImageDecoder::Decode(size_t index) {
233 Parse(kGIFFrameCountQuery);
234
235 if (Failed())
236 return;
237
238 UpdateAggressivePurging(index);
239
240 Vector<size_t> frames_to_decode = FindFramesToDecode(index);
241 for (auto i = frames_to_decode.rbegin(); i != frames_to_decode.rend(); ++i) {
242 if (!reader_->Decode(*i)) {
243 SetFailed();
244 return;
245 }
246
247 // If this returns false, we need more data to continue decoding.
248 if (!PostDecodeProcessing(*i))
249 break;
250 }
251
252 // It is also a fatal error if all data is received and we have decoded all
253 // frames available but the file is truncated.
254 if (index >= frame_buffer_cache_.size() - 1 && IsAllDataReceived() &&
255 reader_ && !reader_->ParseCompleted())
256 SetFailed();
257 }
258
259 void GIFImageDecoder::Parse(GIFParseQuery query) {
260 if (Failed())
261 return;
262
263 if (!reader_) {
264 reader_ = WTF::MakeUnique<GIFImageReader>(this);
265 reader_->SetData(data_);
266 }
267
268 if (!reader_->Parse(query))
269 SetFailed();
270 }
271
272 void GIFImageDecoder::OnInitFrameBuffer(size_t frame_index) {
273 current_buffer_saw_alpha_ = false;
274 }
275
276 bool GIFImageDecoder::CanReusePreviousFrameBuffer(size_t frame_index) const {
277 DCHECK(frame_index < frame_buffer_cache_.size());
278 return frame_buffer_cache_[frame_index].GetDisposalMethod() !=
279 ImageFrame::kDisposeOverwritePrevious;
280 } 331 }
281 332
282 } // namespace blink 333 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698