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

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

Issue 2155973002: Save a bitmap copy when advancing to dependent GIF and WebP animation frames (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 { 349 {
350 // Initialize the frame rect in our buffer. 350 // Initialize the frame rect in our buffer.
351 ImageFrame* const buffer = &m_frameBufferCache[frameIndex]; 351 ImageFrame* const buffer = &m_frameBufferCache[frameIndex];
352 352
353 size_t requiredPreviousFrameIndex = buffer->requiredPreviousFrameIndex(); 353 size_t requiredPreviousFrameIndex = buffer->requiredPreviousFrameIndex();
354 if (requiredPreviousFrameIndex == kNotFound) { 354 if (requiredPreviousFrameIndex == kNotFound) {
355 // This frame doesn't rely on any previous data. 355 // This frame doesn't rely on any previous data.
356 if (!buffer->setSize(size().width(), size().height())) 356 if (!buffer->setSize(size().width(), size().height()))
357 return setFailed(); 357 return setFailed();
358 } else { 358 } else {
359 const ImageFrame* prevBuffer = &m_frameBufferCache[requiredPreviousFrame Index]; 359 ImageFrame* prevBuffer = &m_frameBufferCache[requiredPreviousFrameIndex] ;
360 ASSERT(prevBuffer->getStatus() == ImageFrame::FrameComplete); 360 ASSERT(prevBuffer->getStatus() == ImageFrame::FrameComplete);
361 361
362 // Preserve the last frame as the starting state for this frame. 362 if (buffer->getDisposalMethod() == ImageFrame::DisposeOverwritePrevious) {
363 if (!buffer->copyBitmapData(*prevBuffer)) 363 // Preserve the last frame as the starting state for this frame as
364 return setFailed(); 364 // the next frame would also use it.
Peter Kasting 2016/07/19 03:04:17 Nit: How about: The next frame will also use |pre
aleksandar.stojiljkovic 2016/07/19 11:10:40 Done.
365 if (!buffer->copyBitmapData(*prevBuffer))
366 return setFailed();
367 } else {
368 // Use the required frame as the starting state for this frame.
Peter Kasting 2016/07/19 03:04:17 Nit: How about: This is the only frame to use |pr
aleksandar.stojiljkovic 2016/07/19 11:10:40 Done.
369 buffer->takeBitmapData(*prevBuffer);
370 }
365 371
366 if (prevBuffer->getDisposalMethod() == ImageFrame::DisposeOverwriteBgcol or) { 372 if (prevBuffer->getDisposalMethod() == ImageFrame::DisposeOverwriteBgcol or) {
367 // We want to clear the previous frame to transparent, without 373 // We want to clear the previous frame to transparent, without
368 // affecting pixels in the image outside of the frame. 374 // affecting pixels in the image outside of the frame.
369 const IntRect& prevRect = prevBuffer->originalFrameRect(); 375 const IntRect& prevRect = prevBuffer->originalFrameRect();
370 ASSERT(!prevRect.contains(IntRect(IntPoint(), size()))); 376 ASSERT(!prevRect.contains(IntRect(IntPoint(), size())));
371 buffer->zeroFillFrameRect(prevRect); 377 buffer->zeroFillFrameRect(prevRect);
372 } 378 }
373 } 379 }
374 380
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 m_purgeAggressively = true; 423 m_purgeAggressively = true;
418 return; 424 return;
419 } 425 }
420 426
421 const uint64_t totalMemoryUsage = frameMemoryUsage * index; 427 const uint64_t totalMemoryUsage = frameMemoryUsage * index;
422 if (totalMemoryUsage > m_maxDecodedBytes) { 428 if (totalMemoryUsage > m_maxDecodedBytes) {
423 m_purgeAggressively = true; 429 m_purgeAggressively = true;
424 } 430 }
425 } 431 }
426 } // namespace blink 432 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698