Changeset 31578 in webkit

Timestamp:

Apr 2, 2008 10:56:21 PM (16 years ago)

Author:

beidson@apple.com

Message:

WebCore:

2008-04-02 Brady Eidson <​beidson@apple.com>

Reviewed by Mitz Pettel

<rdar://problem/5838347> and ​http://bugs.webkit.org/show_bug.cgi?id=11839
Webarchive fails to save CSS files in @import statements

• css/CSSStyleSheet.cpp: (WebCore::CSSStyleSheet::addSubresourceURLStrings): Recursively add the URL each @import rule under the current style sheet.
• css/CSSStyleSheet.h:
• css/StyleSheet.h: (WebCore::StyleSheet::addSubresourceURLStrings):

• html/HTMLLinkElement.cpp: (WebCore::HTMLLinkElement::getSubresourceAttributeStrings): Add the linked URL as well as all @import rules rooted at the linked stylesheet.

• html/HTMLStyleElement.cpp: (WebCore::HTMLStyleElement::getSubresourceAttributeStrings): Walk all @import rules rooted at this stylesheet to add to the list.
• html/HTMLStyleElement.h:

LayoutTests:

2008-04-02 Brady Eidson <​beidson@apple.com>

Written by David Kilzer, tweaked by Brady, Reviewed by Mitz Pettel

• test for ​http://bugs.webkit.org/show_bug.cgi?id=11839 Webarchive fails to save CSS files in @import statements

The idea is to <link> to a CSS file which @imports another CSS file,
and also @import a CSS file inside a <style> element, which also @imports another CSS file

Then make sure all 4 of the css files are in the resulting webarchive

• webarchive/resources/test-css-import-recurse.css: Added.
• webarchive/resources/test-css-import.css: Added.
• webarchive/resources/test-css-link-recurse.css: Added.
• webarchive/resources/test-css-link.css: Added.
• webarchive/test-css-import-expected.txt: Added.
• webarchive/test-css-import.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webarchive/resources/test-css-import-recurse.css (added)
• LayoutTests/webarchive/resources/test-css-import.css (added)
• LayoutTests/webarchive/resources/test-css-link-recurse.css (added)
• LayoutTests/webarchive/resources/test-css-link.css (added)
• LayoutTests/webarchive/test-css-import-expected.txt (added)
• LayoutTests/webarchive/test-css-import.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSStyleSheet.cpp (modified) (1 diff)
• WebCore/css/CSSStyleSheet.h (modified) (1 diff)
• WebCore/css/StyleSheet.h (modified) (2 diffs)
• WebCore/html/HTMLLinkElement.cpp (modified) (1 diff)
• WebCore/html/HTMLStyleElement.cpp (modified) (1 diff)
• WebCore/html/HTMLStyleElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-04-02  Brady Eidson  <beidson@apple.com>
+
+        Written by David Kilzer, tweaked by Brady, Reviewed by Mitz Pettel
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=11839
+          Webarchive fails to save CSS files in @import statements
+
+        The idea is to <link> to a CSS file which @imports another CSS file,
+        and also @import a CSS file inside a <style> element, which also @imports another CSS file
+
+        Then make sure all 4 of the css files are in the resulting webarchive
+
+        * webarchive/resources/test-css-import-recurse.css: Added.
+        * webarchive/resources/test-css-import.css: Added.
+        * webarchive/resources/test-css-link-recurse.css: Added.
+        * webarchive/resources/test-css-link.css: Added.
+        * webarchive/test-css-import-expected.txt: Added.
+        * webarchive/test-css-import.html: Added.
+
 2008-04-02  Nikolas Zimmermann  <zimmermann@kde.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-02  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Mitz Pettel
+
+        <rdar://problem/5838347> and http://bugs.webkit.org/show_bug.cgi?id=11839
+        Webarchive fails to save CSS files in @import statements
+
+        * css/CSSStyleSheet.cpp:
+        (WebCore::CSSStyleSheet::addSubresourceURLStrings): Recursively add the URL each @import rule under the current style sheet.
+        * css/CSSStyleSheet.h:
+        * css/StyleSheet.h:
+        (WebCore::StyleSheet::addSubresourceURLStrings):
+
+        * html/HTMLLinkElement.cpp:
+        (WebCore::HTMLLinkElement::getSubresourceAttributeStrings): Add the linked URL as well as all @import
+          rules rooted at the linked stylesheet.
+
+        * html/HTMLStyleElement.cpp:
+        (WebCore::HTMLStyleElement::getSubresourceAttributeStrings): Walk all @import rules rooted at this
+          stylesheet to add to the list.
+        * html/HTMLStyleElement.h:
+
 2008-04-02  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/css/CSSStyleSheet.cpp

@@ -204 +204 @@
 }
 
-}
+void CSSStyleSheet::addSubresourceURLStrings(HashSet<String>& urls, const String& base) const
+{        
+    OwnPtr<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());
+    }
+}
+
+}

trunk/WebCore/css/CSSStyleSheet.h

@@ -73 +73 @@
 
     bool loadCompleted() const { return m_loadCompleted; }
+    
+    virtual void addSubresourceURLStrings(HashSet<String>&, const String& baseURL) const;
 
 protected:

trunk/WebCore/css/StyleSheet.h

@@ -26 +26 @@
 #include "StyleList.h"
 #include "PlatformString.h"
+
+#include <wtf/HashSet.h>
 
 namespace WebCore {
@@ -60 +62 @@
     virtual void styleSheetChanged() { }
     
+    virtual void addSubresourceURLStrings(HashSet<String>&, const String& baseURL) const { }
+
 protected:
     Node* m_parentNode;

trunk/WebCore/html/HTMLLinkElement.cpp

@@ -349 +349 @@
 
 void HTMLLinkElement::getSubresourceAttributeStrings(Vector<String>& urls) const
-{
-    if (!m_isStyleSheet && !m_isIcon)
+{    
+    if (m_isIcon) {
+        urls.append(href().string());
         return;
+    }
     
+    if (!m_isStyleSheet)
+        return;
+        
+    // Append the URL of this link element.
     urls.append(href().string());
-}
-
-}
+    
+    // Walk the URLs linked by the linked-to stylesheet.
+    HashSet<String> styleURLs;
+    StyleSheet* styleSheet = const_cast<HTMLLinkElement*>(this)->sheet();
+    if (styleSheet)
+        styleSheet->addSubresourceURLStrings(styleURLs, href());
+    
+    HashSet<String>::iterator end = styleURLs.end();
+    for (HashSet<String>::iterator i = styleURLs.begin(); i != end; ++i)
+        urls.append(*i);
+}
+
+}

trunk/WebCore/html/HTMLStyleElement.cpp

@@ -131 +131 @@
 }
 
+void HTMLStyleElement::getSubresourceAttributeStrings(Vector<String>& urls) const
+{    
+    HashSet<String> styleURLs;
+    StyleSheet* styleSheet = const_cast<HTMLStyleElement*>(this)->sheet();
+    if (styleSheet)
+        styleSheet->addSubresourceURLStrings(styleURLs, ownerDocument()->baseURL());
+    
+    HashSet<String>::iterator end = styleURLs.end();
+    for (HashSet<String>::iterator i = styleURLs.begin(); i != end; ++i)
+        urls.append(*i);
 }
+
+}

trunk/WebCore/html/HTMLStyleElement.h

@@ -65 +65 @@
     virtual void setLoading(bool loading) { m_loading = loading; }
 
+    virtual void getSubresourceAttributeStrings(Vector<String>&) const;
+
 protected:
     String m_media;