Changeset 20184 in webkit

Timestamp:

Mar 14, 2007 2:20:47 AM (17 years ago)

Author:

hyatt

Message:

Fix Radar 5050688.

For large animated GIFs, destroy and recreate the source for every animation frame. This keeps
the memory consumption down while giant images are animating.

Reviewed by andersca

• platform/graphics/BitmapImage.cpp: (WebCore::BitmapImage::BitmapImage): (WebCore::BitmapImage::destroyDecodedData): (WebCore::BitmapImage::dataChanged): (WebCore::BitmapImage::advanceAnimation):
• platform/graphics/BitmapImage.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/BitmapImage.cpp (modified) (5 diffs)
• platform/graphics/BitmapImage.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-03-14  David Hyatt  <hyatt@apple.com>
+
+        Fix Radar 5050688.  
+
+        For large animated GIFs, destroy and recreate the source for every animation frame.  This keeps
+        the memory consumption down while giant images are animating.
+
+        Reviewed by andersca
+
+        * platform/graphics/BitmapImage.cpp:
+        (WebCore::BitmapImage::BitmapImage):
+        (WebCore::BitmapImage::destroyDecodedData):
+        (WebCore::BitmapImage::dataChanged):
+        (WebCore::BitmapImage::advanceAnimation):
+        * platform/graphics/BitmapImage.h:
+
 2007-03-14  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/platform/graphics/BitmapImage.cpp

@@ -52 +52 @@
     , m_animatingImageType(true)
     , m_animationFinished(false)
+    , m_allDataReceived(false)
     , m_haveSize(false)
     , m_sizeAvailable(false)
@@ -95 +96 @@
             // while animating that it seems to never clear.
             m_source.clear();
-            dataChanged(true);
+            m_source.setData(m_data.get(), m_allDataReceived);
         }
     }
@@ -143 +144 @@
     
     // Feed all the data we've seen so far to the image decoder.
+    m_allDataReceived = allDataReceived;
     m_source.setData(m_data.get(), allDataReceived);
     
@@ -265 +267 @@
     int frameSize = m_size.width() * m_size.height() * 4;
     if (frameCount() * frameSize > cLargeAnimationCutoff) {
-        // Go ahead and decode the next frame so that it can rely on the previous frame.
+        // Clear and reset the source.
+        m_source.clear();
+        m_source.setData(m_data.get(), m_allDataReceived);
+        
+        // Go ahead and decode the next frame.
         frameAtIndex(m_currentFrame);
         
@@ -271 +277 @@
         if (m_frames[previousFrame].m_frame) {
             m_frames[previousFrame].clear();
-            m_source.destroyFrameAtIndex(previousFrame);
             m_decodedSize -= frameSize;
             if (imageObserver())

trunk/WebCore/platform/graphics/BitmapImage.h

@@ -183 +183 @@
     bool m_animationFinished;  // Whether or not we've completed the entire animation.
 
+    bool m_allDataReceived;  // Whether or not we've received all our data.
+
     mutable bool m_haveSize; // Whether or not our |m_size| member variable has the final overall image size yet.
     bool m_sizeAvailable; // Whether or not we can obtain the size of the first image frame yet from ImageIO.