Changeset 24500 in webkit

Timestamp:

Jul 20, 2007, 6:23:51 PM (18 years ago)

Author:

andersca

Message:

Reviewed by Darin.

If the style sheet requested is a user style sheet, don't store it in the DocLoader's resource map;
user style sheets can outlive their doc loaders.

• loader/DocLoader.cpp: (WebCore::DocLoader::requestCSSStyleSheet):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocLoader.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-20  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Darin.
+
+        If the style sheet requested is a user style sheet, don't store it in the DocLoader's resource map;
+        user style sheets can outlive their doc loaders.
+
+        * loader/DocLoader.cpp:
+        (WebCore::DocLoader::requestCSSStyleSheet):
+
 2007-07-20  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/loader/DocLoader.cpp

@@ -96 +96 @@
     // if this resource is already in the cache. It's theoretically possible that what's in the cache already
     // is a load that failed because of the canLoad check. Probably not an issue in practice.
-    return static_cast<CachedCSSStyleSheet*>(requestResource(CachedResource::CSSStyleSheet, url, &charset, isUserStyleSheet, !isUserStyleSheet));
+    CachedCSSStyleSheet *sheet = static_cast<CachedCSSStyleSheet*>(requestResource(CachedResource::CSSStyleSheet, url, &charset, isUserStyleSheet, !isUserStyleSheet));
+
+    // A user style sheet can outlive its DocLoader so don't store any pointers to it
+    if (sheet && isUserStyleSheet) {
+        sheet->setDocLoader(0);
+        m_docResources.remove(sheet->url());
+    }
+    
+    return sheet;
 }