Changeset 38293

Timestamp:

11/10/08 23:06:41 (16 months ago)

Author:

slewis@apple.com

Message:

2008-11-10 Stephanie Lewis < slewis@apple.com>

Reviewed by Dan Bernstein.

Clear the image source cache even if we haven't decoded any of the image data.
We use the image source cache when calculating layout.

• loader/Cache.cpp: (WebCore::Cache::pruneDeadResources):
• platform/graphics/BitmapImage.cpp: (WebCore::BitmapImage::destroyDecodedData):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/Cache.cpp (modified) (1 diff)
• platform/graphics/BitmapImage.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-11-10  Stephanie Lewis  <slewis@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Clear the image source cache even if we haven't decoded any of the image data.
+        We use the image source cache when calculating layout.
+
+        * loader/Cache.cpp:
+        (WebCore::Cache::pruneDeadResources):
+        * platform/graphics/BitmapImage.cpp:
+        (WebCore::BitmapImage::destroyDecodedData):
+
 2008-11-10  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/loader/Cache.cpp

@@ -321 +321 @@
         while (current) {
             CachedResource* prev = current->m_prevInAllResourcesList;
-            if (!current->hasClients() && !current->isPreloaded() && current->isLoaded() && current->decodedSize()) {
+            if (!current->hasClients() && !current->isPreloaded() && current->isLoaded()) {
                 // Destroy our decoded data. This will remove us from 
                 // m_liveDecodedResources, and possibly move us to a differnt 

trunk/WebCore/platform/graphics/BitmapImage.cpp

@@ -100 +100 @@
                 imageObserver()->decodedSizeChanged(this, sizeChange);
         }
-        
-        if (!incremental) {
-            // Reset the image source, since Image I/O has an underlying cache that it uses
-            // while animating that it seems to never clear.
-            m_source.clear();
-            m_source.setData(m_data.get(), m_allDataReceived);
-        }
-    }
+    }
+    if (!incremental) {
+        // Reset the image source, since Image I/O has an underlying cache that it uses
+        // while animating that it seems to never clear.
+        m_source.clear();
+        m_source.setData(m_data.get(), m_allDataReceived);
+    }    
 }