Changeset 38787 in webkit

Timestamp:

Nov 26, 2008 11:44:05 AM (15 years ago)

Author:

ddkilzer@apple.com

Message:

Make CSSStyleSheet::addSubresourceURLStrings() iterative

Part of the fix for Bug 11850: Webarchive fails to save images referenced in CSS
<​https://bugs.webkit.org/show_bug.cgi?id=11850>

Reviewed by Brady Eidson.

• css/CSSStyleSheet.cpp: (WebCore::CSSStyleSheet::addSubresourceURLStrings): Switch algorithm from recursive to iterative for gathering the list of all CSS stylesheets referenced in @import statements.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSStyleSheet.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-11-26  David Kilzer  <ddkilzer@apple.com>
+
+        Make CSSStyleSheet::addSubresourceURLStrings() iterative
+
+        Part of the fix for Bug 11850: Webarchive fails to save images referenced in CSS
+        <https://bugs.webkit.org/show_bug.cgi?id=11850>
+
+        Reviewed by Brady Eidson.
+
+        * css/CSSStyleSheet.cpp:
+        (WebCore::CSSStyleSheet::addSubresourceURLStrings): Switch algorithm
+        from recursive to iterative for gathering the list of all CSS
+        stylesheets referenced in @import statements.
+
 2008-11-26  Dirk Schulze  <krit@webkit.org>
 

trunk/WebCore/css/CSSStyleSheet.cpp

@@ -200 +200 @@
 
 void CSSStyleSheet::addSubresourceURLStrings(HashSet<String>& urls, const String& base) const
-{        
-    RefPtr<CSSRuleList> ruleList = const_cast<CSSStyleSheet*>(this)->cssRules();
-    
-    // Add the URLs for each child import rule, and recurse for the stylesheet belonging to each of those rules.
-    for (unsigned i = 0; i < ruleList->length(); ++i) {
-        CSSRule* rule = ruleList->item(i);
-        if (rule->type() != CSSRule::IMPORT_RULE)
-            continue;
-
-        CSSImportRule* importRule = static_cast<CSSImportRule*>(rule);
-        CSSStyleSheet* ruleSheet = importRule->styleSheet();
-        if (!ruleSheet)
-            continue;
-
-        KURL fullURL(KURL(base), importRule->href());
-        urls.add(fullURL.string());
-        ruleSheet->addSubresourceURLStrings(urls, fullURL.string());
-    }
-}
-
-}
+{
+    typedef HashMap<RefPtr<CSSStyleSheet>, KURL> CSSStyleSheetMap;
+    CSSStyleSheetMap styleSheetMap;
+    styleSheetMap.add(const_cast<CSSStyleSheet*>(this), KURL(base));
+
+    while(styleSheetMap.size() > 0) {
+        CSSStyleSheetMap::iterator it = styleSheetMap.begin();
+        RefPtr<CSSStyleSheet> styleSheet = it->first;
+        const KURL baseURL = it->second;
+        styleSheetMap.remove(it);
+
+        RefPtr<CSSRuleList> ruleList = styleSheet->cssRules();
+
+        // Add the URLs for each child import rule to styleSheetMap for processing
+        for (unsigned i = 0; i < ruleList->length(); ++i) {
+            CSSRule* rule = ruleList->item(i);
+            if (rule->type() != CSSRule::IMPORT_RULE)
+                continue;
+
+            CSSImportRule* importRule = static_cast<CSSImportRule*>(rule);
+            RefPtr<CSSStyleSheet> ruleSheet = importRule->styleSheet();
+            if (!ruleSheet)
+                continue;
+
+            const KURL fullURL(baseURL, importRule->href());
+            if (!urls.contains(fullURL.string())) {
+                urls.add(fullURL.string());
+                styleSheetMap.add(ruleSheet, fullURL);
+            }
+        }
+    }
+}
+
+}