Changeset 20242 in webkit

Timestamp:

Mar 16, 2007 3:29:52 PM (17 years ago)

Author:

hyatt

Message:

Fix for 13084, assertion failure in the Cache. Convert the client list
to a HashCountedSet so that multiple refs and derefs are allowed.

Fix RenderImage so that if it has the same image used as a background/border
and as the foreground that it will repaint properly (can be tested using
border-image and a foreground image).

Optimize list marker so that it doesn't waste time in the base class method,
since list markers don't support background or border images.

Reviewed by andersca

• ChangeLog:
• loader/CachedResource.cpp: (WebCore::CachedResource::ref):
• loader/CachedResource.h:
• loader/CachedResourceClientWalker.cpp: (WebCore::CachedResourceClientWalker::CachedResourceClientWalker):
• loader/CachedResourceClientWalker.h:
• rendering/RenderImage.cpp: (WebCore::RenderImage::imageChanged):
• rendering/RenderListMarker.cpp: (WebCore::RenderListMarker::imageChanged):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/CachedResource.cpp (modified) (1 diff)
• loader/CachedResource.h (modified) (2 diffs)
• loader/CachedResourceClientWalker.cpp (modified) (1 diff)
• loader/CachedResourceClientWalker.h (modified) (2 diffs)
• rendering/RenderImage.cpp (modified) (1 diff)
• rendering/RenderListMarker.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-03-16  David Hyatt  <hyatt@apple.com>
+
+        Fix for 13084, assertion failure in the Cache.  Convert the client list
+        to a HashCountedSet so that multiple refs and derefs are allowed.
+
+        Fix RenderImage so that if it has the same image used as a background/border
+        and as the foreground that it will repaint properly (can be tested using
+        border-image and a foreground image).
+
+        Optimize list marker so that it doesn't waste time in the base class method,
+        since list markers don't support background or border images.
+
+        Reviewed by andersca
+
+        * ChangeLog:
+        * loader/CachedResource.cpp:
+        (WebCore::CachedResource::ref):
+        * loader/CachedResource.h:
+        * loader/CachedResourceClientWalker.cpp:
+        (WebCore::CachedResourceClientWalker::CachedResourceClientWalker):
+        * loader/CachedResourceClientWalker.h:
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::imageChanged):
+        * rendering/RenderListMarker.cpp:
+        (WebCore::RenderListMarker::imageChanged):
+
 2007-03-16  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebCore/loader/CachedResource.cpp

@@ -95 +95 @@
 void CachedResource::ref(CachedResourceClient *c)
 {
-    ASSERT(!m_clients.contains(c));
     if (!referenced() && inCache())
         cache()->addToLiveObjectSize(size());

trunk/WebCore/loader/CachedResource.h

@@ -33 +33 @@
 #include "ResourceResponse.h"
 #include "SharedBuffer.h"
-#include <wtf/HashSet.h>
+#include <wtf/HashCountedSet.h>
 #include <wtf/Vector.h>
 #include <time.h>
@@ -137 +137 @@
     void setEncodedSize(unsigned);
 
-    HashSet<CachedResourceClient*> m_clients;
+    HashCountedSet<CachedResourceClient*> m_clients;
 
     String m_url;

trunk/WebCore/loader/CachedResourceClientWalker.cpp

@@ -31 +31 @@
 namespace WebCore {
 
-CachedResourceClientWalker::CachedResourceClientWalker(const HashSet<CachedResourceClient*>& set)
+CachedResourceClientWalker::CachedResourceClientWalker(const HashCountedSet<CachedResourceClient*>& set)
     : m_clientSet(set), m_clientVector(set.size()), m_index(0)
 {
-    typedef HashSet<CachedResourceClient*>::const_iterator Iterator;
+    typedef HashCountedSet<CachedResourceClient*>::const_iterator Iterator;
     Iterator end = set.end();
     size_t clientIndex = 0;
     for (Iterator current = set.begin(); current != end; ++current)
-        m_clientVector[clientIndex++] = *current;
+        m_clientVector[clientIndex++] = current->first;
 }
 

trunk/WebCore/loader/CachedResourceClientWalker.h

@@ -28 +28 @@
 #define CachedResourceClientWalker_h
 
-#include <wtf/HashSet.h>
+#include <wtf/HashCountedSet.h>
 #include <wtf/Vector.h>
 
@@ -39 +39 @@
     class CachedResourceClientWalker {
     public:
-        CachedResourceClientWalker(const HashSet<CachedResourceClient*>&);
+        CachedResourceClientWalker(const HashCountedSet<CachedResourceClient*>&);
         CachedResourceClient* next();
     private:
-        const HashSet<CachedResourceClient*>& m_clientSet;
+        const HashCountedSet<CachedResourceClient*>& m_clientSet;
         Vector<CachedResourceClient*> m_clientVector;
         size_t m_index;

trunk/WebCore/rendering/RenderImage.cpp

@@ -129 +129 @@
         return;
 
-    if (newImage != m_cachedImage) {
-        RenderReplaced::imageChanged(newImage);
-        return;
-    }
+    RenderReplaced::imageChanged(newImage);
+    if (newImage != m_cachedImage)
+        return;
 
     bool imageSizeChanged = false;

trunk/WebCore/rendering/RenderListMarker.cpp

@@ -632 +632 @@
 void RenderListMarker::imageChanged(CachedImage* o)
 {
-    if (o != m_image) {
-        RenderBox::imageChanged(o);
+    // A list marker can't have a background or border image, so no need to call the base class method.
+    if (o != m_image)
         return;
-    }
 
     if (m_width != m_image->imageSize().width() || m_height != m_image->imageSize().height())