Changeset 24492 in webkit

Timestamp:

Jul 20, 2007 3:52:25 PM (17 years ago)

Author:

andersca

Message:

Reviewed by Darin.

<rdar://problem/5298816> Crash redirecting message, in -[SharedBufferData initWithSharedBuffer:]

Have cached resources keep track of what DocLoader they belong to. This is so that they can remove themselves
from the DocLoader's resource map when they're destroyed when the cache is disabled.

• html/HTMLImageLoader.cpp: (WebCore::HTMLImageLoader::updateFromElement):
• loader/Cache.cpp: (WebCore::Cache::requestResource):
• loader/CachedResource.cpp: (WebCore::CachedResource::CachedResource): (WebCore::CachedResource::~CachedResource):
• loader/CachedResource.h: (WebCore::CachedResource::setDocLoader):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLImageLoader.cpp (modified) (1 diff)
• loader/Cache.cpp (modified) (1 diff)
• loader/CachedResource.cpp (modified) (3 diffs)
• loader/CachedResource.h (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-20  Anders Carlsson  <andersca@apple.com>
+    
+        Reviewed by Darin.
+
+        <rdar://problem/5298816> Crash redirecting message, in -[SharedBufferData initWithSharedBuffer:]
+        
+        Have cached resources keep track of what DocLoader they belong to. This is so that they can remove themselves
+        from the DocLoader's resource map when they're destroyed when the cache is disabled.
+        
+        * html/HTMLImageLoader.cpp:
+        (WebCore::HTMLImageLoader::updateFromElement):
+        * loader/Cache.cpp:
+        (WebCore::Cache::requestResource):
+        * loader/CachedResource.cpp:
+        (WebCore::CachedResource::CachedResource):
+        (WebCore::CachedResource::~CachedResource):
+        * loader/CachedResource.h:
+        (WebCore::CachedResource::setDocLoader):
+
 2007-07-20  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/html/HTMLImageLoader.cpp

@@ -97 +97 @@
             newImage = new CachedImage(doc->docLoader(), parseURL(attr), false /* not for cache */);
             newImage->setLoading(true);
+            newImage->setDocLoader(doc->docLoader());
             doc->docLoader()->m_docResources.set(newImage->url(), newImage);
         } else

trunk/WebCore/loader/Cache.cpp

@@ -116 +116 @@
             // Kick the resource out of the cache, because the cache is disabled.
             resource->setInCache(false);
+            resource->setDocLoader(docLoader);
             if (resource->errorOccurred()) {
                 // We don't support immediate loads, but we do support immediate failure.

trunk/WebCore/loader/CachedResource.cpp

@@ -26 +26 @@
 
 #include "Cache.h"
+#include "DocLoader.h"
 #include "FrameLoader.h"
 #include "Request.h"
@@ -36 +37 @@
     : m_sendResourceLoadCallbacks(sendResourceLoadCallbacks)
     , m_inCache(forCache)
+    , m_docLoader(0)
 {
     m_url = URL;
@@ -67 +69 @@
     m_deleted = true;
 #endif
+    
+    if (m_docLoader)
+        m_docLoader->removeCachedResource(this);
 }
 

trunk/WebCore/loader/CachedResource.h

@@ -35 +35 @@
 class Cache;
 class CachedResourceClient;
+class DocLoader;
 class Request;
 
@@ -129 +130 @@
     virtual void destroyDecodedData() {};
 
+    void setDocLoader(DocLoader* docLoader) { m_docLoader = docLoader; }
+    
 protected:
     void setEncodedSize(unsigned);
@@ -171 +174 @@
     
     bool m_shouldTreatAsLocal;
+
+    DocLoader* m_docLoader; // only non-0 for resources that are not in the cache
 };