Don't cache any SkBitmaps in DeferredImageDecoder

Source/platform/graphics/BitmapImage.cpp

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 128 matching lines @@
 
 void BitmapImage::destroyDecodedDataIfNecessary()
 {
     // Animated images >5MB are considered large enough that we'll only hang on
     // to one frame at a time.
     static const size_t cLargeAnimationCutoff = 5242880;
     size_t allFrameBytes = 0;
     for (size_t i = 0; i < m_frames.size(); ++i)
         allFrameBytes += m_frames[i].m_frameBytes;
 
-    if (allFrameBytes > cLargeAnimationCutoff)
+    if (allFrameBytes > cLargeAnimationCutoff) {
         destroyDecodedData(false);
+    }
 }
 
 void BitmapImage::destroyMetadataAndNotify(size_t frameBytesCleared)
 {
     m_isSolidColor = false;
     m_checkedForSolidColor = false;
 
     if (frameBytesCleared && imageObserver())
         imageObserver()->decodedSizeChanged(this, -safeCast<int>(frameBytesCleared));
 }
@@ skipping 143 matching lines @@
     }
 
     image->draw(ctxt, normSrcRect, normDstRect, compositeOp);
 
     if (ImageObserver* observer = imageObserver())
         observer->didDraw(this);
 
     startAnimation();
 }
 
-void BitmapImage::resetDecoder()
-{
-    ASSERT(isMainThread());
-
-    m_source.resetDecoder();
-}
-
 size_t BitmapImage::frameCount()
 {
     if (!m_haveFrameCount) {
         m_frameCount = m_source.frameCount();
         // If decoder is not initialized yet, m_source.frameCount() returns 0.
         if (m_frameCount)
             m_haveFrameCount = true;
     }
 
     return m_frameCount;
@@ skipping 265 matching lines @@
 
     ++m_currentFrame;
     bool advancedAnimation = true;
     if (m_currentFrame >= frameCount()) {
         ++m_repetitionsComplete;
 
         // Get the repetition count again.  If we weren't able to get a
         // repetition count before, we should have decoded the whole image by
         // now, so it should now be available.
         // Note that we don't need to special-case cAnimationLoopOnce here
-        // because it is 0 (see comments on its declaration in ImageSource.h).
+        // because it is 0 (see comments on its declaration in ImageDecoder.h).

[Stephen White, 2015/03/13 20:21:41]

ImageDecoder.h -> ImageAnimation.h

         if ((repetitionCount(true) != cAnimationLoopInfinite && m_repetitionsComplete > m_repetitionCount)
             || (m_animationPolicy == ImageAnimationPolicyAnimateOnce && m_repetitionsComplete > 0)) {
             m_animationFinished = true;
             m_desiredFrameStartTime = 0;
             --m_currentFrame;
             advancedAnimation = false;
         } else
             m_currentFrame = 0;
     }
     destroyDecodedDataIfNecessary();
@@ skipping 34 matching lines @@
 
     return m_isSolidColor && !m_currentFrame;
 }
 
 Color BitmapImage::solidColor() const
 {
     return m_solidColor;
 }
 
 } // namespace blink