Unreviewed, rolling out r118913.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 May 2012 20:50:31 +0000 (20:50 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 May 2012 20:50:31 +0000 (20:50 +0000)
http://trac.webkit.org/changeset/118913
https://bugs.webkit.org/show_bug.cgi?id=87891

patch is incorrect (see comments in
https://bugs.webkit.org/show_bug.cgi?id=87889) (Requested by
thorton on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-05-30

* css/CSSFontFaceSrcValue.cpp:
(WebCore::CSSFontFaceSrcValue::addSubresourceStyleURLs):
* css/CSSFontFaceSrcValue.h:
(CSSFontFaceSrcValue):
* css/CSSPrimitiveValue.cpp:
(WebCore::CSSPrimitiveValue::addSubresourceStyleURLs):
* css/CSSPrimitiveValue.h:
(CSSPrimitiveValue):
* css/CSSReflectValue.cpp:
(WebCore::CSSReflectValue::addSubresourceStyleURLs):
* css/CSSReflectValue.h:
(CSSReflectValue):
* css/CSSValue.cpp:
(WebCore::CSSValue::addSubresourceStyleURLs):
* css/CSSValue.h:
(CSSValue):
* css/CSSValueList.cpp:
(WebCore::CSSValueList::addSubresourceStyleURLs):
* css/CSSValueList.h:
(CSSValueList):
* css/StylePropertySet.cpp:
(WebCore::StylePropertySet::addSubresourceStyleURLs):
* css/StylePropertySet.h:
(StylePropertySet):
* css/StyleSheetContents.cpp:
(WebCore::StyleSheetContents::addSubresourceStyleURLs):
* css/StyleSheetContents.h:
(StyleSheetContents):
* dom/Element.h:
* dom/Node.cpp:
(WebCore::Node::getSubresourceURLs):
* dom/Node.h:
(WebCore::Node::addSubresourceAttributeURLs):
(WebCore):
* dom/ProcessingInstruction.cpp:
(WebCore::ProcessingInstruction::addSubresourceAttributeURLs):
* dom/ProcessingInstruction.h:
(ProcessingInstruction):
* dom/StyledElement.cpp:
(WebCore::StyledElement::addSubresourceAttributeURLs):
* dom/StyledElement.h:
(StyledElement):
* html/HTMLBodyElement.cpp:
(WebCore::HTMLBodyElement::addSubresourceAttributeURLs):
* html/HTMLBodyElement.h:
(HTMLBodyElement):
* html/HTMLEmbedElement.cpp:
(WebCore::HTMLEmbedElement::addSubresourceAttributeURLs):
* html/HTMLEmbedElement.h:
(HTMLEmbedElement):
* html/HTMLImageElement.cpp:
(WebCore::HTMLImageElement::addSubresourceAttributeURLs):
* html/HTMLImageElement.h:
(HTMLImageElement):
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::addSubresourceAttributeURLs):
* html/HTMLInputElement.h:
(HTMLInputElement):
* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::addSubresourceAttributeURLs):
* html/HTMLLinkElement.h:
(HTMLLinkElement):
* html/HTMLObjectElement.cpp:
(WebCore::HTMLObjectElement::addSubresourceAttributeURLs):
* html/HTMLObjectElement.h:
(HTMLObjectElement):
* html/HTMLParamElement.cpp:
(WebCore::HTMLParamElement::addSubresourceAttributeURLs):
* html/HTMLParamElement.h:
(HTMLParamElement):
* html/HTMLScriptElement.cpp:
(WebCore::HTMLScriptElement::addSubresourceAttributeURLs):
* html/HTMLScriptElement.h:
(HTMLScriptElement):
* html/HTMLStyleElement.cpp:
(WebCore::HTMLStyleElement::addSubresourceAttributeURLs):
* html/HTMLStyleElement.h:
(HTMLStyleElement):
* html/HTMLTableCellElement.cpp:
(WebCore::HTMLTableCellElement::addSubresourceAttributeURLs):
* html/HTMLTableCellElement.h:
(HTMLTableCellElement):
* html/HTMLTableElement.cpp:
(WebCore::HTMLTableElement::addSubresourceAttributeURLs):
* html/HTMLTableElement.h:
(HTMLTableElement):
* svg/SVGCursorElement.cpp:
(WebCore::SVGCursorElement::addSubresourceAttributeURLs):
* svg/SVGCursorElement.h:
(SVGCursorElement):
* svg/SVGFEImageElement.cpp:
(WebCore::SVGFEImageElement::addSubresourceAttributeURLs):
* svg/SVGFEImageElement.h:
(SVGFEImageElement):
* svg/SVGImageElement.cpp:
(WebCore::SVGImageElement::addSubresourceAttributeURLs):
* svg/SVGImageElement.h:
(SVGImageElement):
* svg/SVGScriptElement.cpp:
(WebCore::SVGScriptElement::addSubresourceAttributeURLs):
* svg/SVGScriptElement.h:
(SVGScriptElement):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@118963 268f45cc-cd09-0410-ab3c-d52691b4dbfc

52 files changed:
Source/WebCore/ChangeLog
Source/WebCore/css/CSSFontFaceSrcValue.cpp
Source/WebCore/css/CSSFontFaceSrcValue.h
Source/WebCore/css/CSSPrimitiveValue.cpp
Source/WebCore/css/CSSPrimitiveValue.h
Source/WebCore/css/CSSReflectValue.cpp
Source/WebCore/css/CSSReflectValue.h
Source/WebCore/css/CSSValue.cpp
Source/WebCore/css/CSSValue.h
Source/WebCore/css/CSSValueList.cpp
Source/WebCore/css/CSSValueList.h
Source/WebCore/css/StylePropertySet.cpp
Source/WebCore/css/StylePropertySet.h
Source/WebCore/css/StyleSheetContents.cpp
Source/WebCore/css/StyleSheetContents.h
Source/WebCore/dom/Element.h
Source/WebCore/dom/Node.cpp
Source/WebCore/dom/Node.h
Source/WebCore/dom/ProcessingInstruction.cpp
Source/WebCore/dom/ProcessingInstruction.h
Source/WebCore/dom/StyledElement.cpp
Source/WebCore/dom/StyledElement.h
Source/WebCore/html/HTMLBodyElement.cpp
Source/WebCore/html/HTMLBodyElement.h
Source/WebCore/html/HTMLEmbedElement.cpp
Source/WebCore/html/HTMLEmbedElement.h
Source/WebCore/html/HTMLImageElement.cpp
Source/WebCore/html/HTMLImageElement.h
Source/WebCore/html/HTMLInputElement.cpp
Source/WebCore/html/HTMLInputElement.h
Source/WebCore/html/HTMLLinkElement.cpp
Source/WebCore/html/HTMLLinkElement.h
Source/WebCore/html/HTMLObjectElement.cpp
Source/WebCore/html/HTMLObjectElement.h
Source/WebCore/html/HTMLParamElement.cpp
Source/WebCore/html/HTMLParamElement.h
Source/WebCore/html/HTMLScriptElement.cpp
Source/WebCore/html/HTMLScriptElement.h
Source/WebCore/html/HTMLStyleElement.cpp
Source/WebCore/html/HTMLStyleElement.h
Source/WebCore/html/HTMLTableCellElement.cpp
Source/WebCore/html/HTMLTableCellElement.h
Source/WebCore/html/HTMLTableElement.cpp
Source/WebCore/html/HTMLTableElement.h
Source/WebCore/svg/SVGCursorElement.cpp
Source/WebCore/svg/SVGCursorElement.h
Source/WebCore/svg/SVGFEImageElement.cpp
Source/WebCore/svg/SVGFEImageElement.h
Source/WebCore/svg/SVGImageElement.cpp
Source/WebCore/svg/SVGImageElement.h
Source/WebCore/svg/SVGScriptElement.cpp
Source/WebCore/svg/SVGScriptElement.h

index c274d47..73b9395 100644 (file)
@@ -1,3 +1,116 @@
+2012-05-30  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r118913.
+        http://trac.webkit.org/changeset/118913
+        https://bugs.webkit.org/show_bug.cgi?id=87891
+
+        patch is incorrect (see comments in
+        https://bugs.webkit.org/show_bug.cgi?id=87889) (Requested by
+        thorton on #webkit).
+
+        * css/CSSFontFaceSrcValue.cpp:
+        (WebCore::CSSFontFaceSrcValue::addSubresourceStyleURLs):
+        * css/CSSFontFaceSrcValue.h:
+        (CSSFontFaceSrcValue):
+        * css/CSSPrimitiveValue.cpp:
+        (WebCore::CSSPrimitiveValue::addSubresourceStyleURLs):
+        * css/CSSPrimitiveValue.h:
+        (CSSPrimitiveValue):
+        * css/CSSReflectValue.cpp:
+        (WebCore::CSSReflectValue::addSubresourceStyleURLs):
+        * css/CSSReflectValue.h:
+        (CSSReflectValue):
+        * css/CSSValue.cpp:
+        (WebCore::CSSValue::addSubresourceStyleURLs):
+        * css/CSSValue.h:
+        (CSSValue):
+        * css/CSSValueList.cpp:
+        (WebCore::CSSValueList::addSubresourceStyleURLs):
+        * css/CSSValueList.h:
+        (CSSValueList):
+        * css/StylePropertySet.cpp:
+        (WebCore::StylePropertySet::addSubresourceStyleURLs):
+        * css/StylePropertySet.h:
+        (StylePropertySet):
+        * css/StyleSheetContents.cpp:
+        (WebCore::StyleSheetContents::addSubresourceStyleURLs):
+        * css/StyleSheetContents.h:
+        (StyleSheetContents):
+        * dom/Element.h:
+        * dom/Node.cpp:
+        (WebCore::Node::getSubresourceURLs):
+        * dom/Node.h:
+        (WebCore::Node::addSubresourceAttributeURLs):
+        (WebCore):
+        * dom/ProcessingInstruction.cpp:
+        (WebCore::ProcessingInstruction::addSubresourceAttributeURLs):
+        * dom/ProcessingInstruction.h:
+        (ProcessingInstruction):
+        * dom/StyledElement.cpp:
+        (WebCore::StyledElement::addSubresourceAttributeURLs):
+        * dom/StyledElement.h:
+        (StyledElement):
+        * html/HTMLBodyElement.cpp:
+        (WebCore::HTMLBodyElement::addSubresourceAttributeURLs):
+        * html/HTMLBodyElement.h:
+        (HTMLBodyElement):
+        * html/HTMLEmbedElement.cpp:
+        (WebCore::HTMLEmbedElement::addSubresourceAttributeURLs):
+        * html/HTMLEmbedElement.h:
+        (HTMLEmbedElement):
+        * html/HTMLImageElement.cpp:
+        (WebCore::HTMLImageElement::addSubresourceAttributeURLs):
+        * html/HTMLImageElement.h:
+        (HTMLImageElement):
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::addSubresourceAttributeURLs):
+        * html/HTMLInputElement.h:
+        (HTMLInputElement):
+        * html/HTMLLinkElement.cpp:
+        (WebCore::HTMLLinkElement::addSubresourceAttributeURLs):
+        * html/HTMLLinkElement.h:
+        (HTMLLinkElement):
+        * html/HTMLObjectElement.cpp:
+        (WebCore::HTMLObjectElement::addSubresourceAttributeURLs):
+        * html/HTMLObjectElement.h:
+        (HTMLObjectElement):
+        * html/HTMLParamElement.cpp:
+        (WebCore::HTMLParamElement::addSubresourceAttributeURLs):
+        * html/HTMLParamElement.h:
+        (HTMLParamElement):
+        * html/HTMLScriptElement.cpp:
+        (WebCore::HTMLScriptElement::addSubresourceAttributeURLs):
+        * html/HTMLScriptElement.h:
+        (HTMLScriptElement):
+        * html/HTMLStyleElement.cpp:
+        (WebCore::HTMLStyleElement::addSubresourceAttributeURLs):
+        * html/HTMLStyleElement.h:
+        (HTMLStyleElement):
+        * html/HTMLTableCellElement.cpp:
+        (WebCore::HTMLTableCellElement::addSubresourceAttributeURLs):
+        * html/HTMLTableCellElement.h:
+        (HTMLTableCellElement):
+        * html/HTMLTableElement.cpp:
+        (WebCore::HTMLTableElement::addSubresourceAttributeURLs):
+        * html/HTMLTableElement.h:
+        (HTMLTableElement):
+        * svg/SVGCursorElement.cpp:
+        (WebCore::SVGCursorElement::addSubresourceAttributeURLs):
+        * svg/SVGCursorElement.h:
+        (SVGCursorElement):
+        * svg/SVGFEImageElement.cpp:
+        (WebCore::SVGFEImageElement::addSubresourceAttributeURLs):
+        * svg/SVGFEImageElement.h:
+        (SVGFEImageElement):
+        * svg/SVGImageElement.cpp:
+        (WebCore::SVGImageElement::addSubresourceAttributeURLs):
+        * svg/SVGImageElement.h:
+        (SVGImageElement):
+        * svg/SVGScriptElement.cpp:
+        (WebCore::SVGScriptElement::addSubresourceAttributeURLs):
+        * svg/SVGScriptElement.h:
+        (SVGScriptElement):
+
 2012-05-30  Shezan Baig  <shezbaig.wk@gmail.com>
 
         Rename offsetTopLeft in RenderBoxModelObject to something better
index 40143f8..79ae0e7 100644 (file)
@@ -73,7 +73,7 @@ String CSSFontFaceSrcValue::customCssText() const
     return result;
 }
 
-void CSSFontFaceSrcValue::collectSubresourceURLs(ListHashSet<KURL>& urls, const StyleSheetContents* styleSheet) const
+void CSSFontFaceSrcValue::addSubresourceStyleURLs(ListHashSet<KURL>& urls, const StyleSheetContents* styleSheet) const
 {
     if (!isLocal())
         addSubresourceURL(urls, styleSheet->completeURL(m_resource));
index 0632f14..94607fe 100644 (file)
@@ -65,7 +65,7 @@ public:
 
     String customCssText() const;
 
-    void collectSubresourceURLs(ListHashSet<KURL>&, const StyleSheetContents*) const;
+    void addSubresourceStyleURLs(ListHashSet<KURL>&, const StyleSheetContents*) const;
 
     CachedFont* cachedFont(Document*);
 
index 4640f2c..592494a 100644 (file)
@@ -1064,7 +1064,7 @@ String CSSPrimitiveValue::customCssText() const
     return text;
 }
 
-void CSSPrimitiveValue::collectSubresourceURLs(ListHashSet<KURL>& urls, const StyleSheetContents* styleSheet) const
+void CSSPrimitiveValue::addSubresourceStyleURLs(ListHashSet<KURL>& urls, const StyleSheetContents* styleSheet) const
 {
     if (m_primitiveUnitType == CSS_URI)
         addSubresourceURL(urls, styleSheet->completeURL(m_value.string));
index c7bf011..ccd187b 100644 (file)
@@ -283,7 +283,7 @@ public:
 
     bool isQuirkValue() { return m_isQuirkValue; }
 
-    void collectSubresourceURLs(ListHashSet<KURL>&, const StyleSheetContents*) const;
+    void addSubresourceStyleURLs(ListHashSet<KURL>&, const StyleSheetContents*) const;
 
     Length viewportPercentageLength();
     
index 50de108..b36c3ad 100644 (file)
@@ -59,10 +59,10 @@ String CSSReflectValue::customCssText() const
     return result;
 }
 
-void CSSReflectValue::collectSubresourceURLs(ListHashSet<KURL>& urls, const StyleSheetContents* styleSheet) const
+void CSSReflectValue::addSubresourceStyleURLs(ListHashSet<KURL>& urls, const StyleSheetContents* styleSheet) const
 {
     if (m_mask)
-        m_mask->collectSubresourceURLs(urls, styleSheet);
+        m_mask->addSubresourceStyleURLs(urls, styleSheet);
 }
 
 } // namespace WebCore
index 2720ba8..5cfb20e 100644 (file)
@@ -49,7 +49,7 @@ public:
 
     String customCssText() const;
 
-    void collectSubresourceURLs(ListHashSet<KURL>&, const StyleSheetContents*) const;
+    void addSubresourceStyleURLs(ListHashSet<KURL>&, const StyleSheetContents*) const;
 
 private:
     CSSReflectValue(CSSReflectionDirection direction, PassRefPtr<CSSPrimitiveValue> offset, PassRefPtr<CSSValue> mask)
index 4df8c56..f568cc5 100644 (file)
@@ -99,19 +99,19 @@ CSSValue::Type CSSValue::cssValueType() const
     return CSS_CUSTOM;
 }
 
-void CSSValue::collectSubresourceURLs(ListHashSet<KURL>& urls, const StyleSheetContents* styleSheet) const
+void CSSValue::addSubresourceStyleURLs(ListHashSet<KURL>& urls, const StyleSheetContents* styleSheet) const
 {
     // This should get called for internal instances only.
     ASSERT(!isCSSOMSafe());
 
     if (isPrimitiveValue())
-        static_cast<const CSSPrimitiveValue*>(this)->collectSubresourceURLs(urls, styleSheet);
+        static_cast<const CSSPrimitiveValue*>(this)->addSubresourceStyleURLs(urls, styleSheet);
     else if (isValueList())
-        static_cast<const CSSValueList*>(this)->collectSubresourceURLs(urls, styleSheet);
+        static_cast<const CSSValueList*>(this)->addSubresourceStyleURLs(urls, styleSheet);
     else if (classType() == FontFaceSrcClass)
-        static_cast<const CSSFontFaceSrcValue*>(this)->collectSubresourceURLs(urls, styleSheet);
+        static_cast<const CSSFontFaceSrcValue*>(this)->addSubresourceStyleURLs(urls, styleSheet);
     else if (classType() == ReflectClass)
-        static_cast<const CSSReflectValue*>(this)->collectSubresourceURLs(urls, styleSheet);
+        static_cast<const CSSReflectValue*>(this)->addSubresourceStyleURLs(urls, styleSheet);
 }
 
 String CSSValue::cssText() const
index f05c843..fe56428 100644 (file)
@@ -107,7 +107,7 @@ public:
 
     PassRefPtr<CSSValue> cloneForCSSOM() const;
 
-    void collectSubresourceURLs(ListHashSet<KURL>&, const StyleSheetContents*) const;
+    void addSubresourceStyleURLs(ListHashSet<KURL>&, const StyleSheetContents*) const;
 
 protected:
 
index 1cc42c4..3ab7f94 100644 (file)
@@ -136,11 +136,11 @@ String CSSValueList::customCssText() const
     return result.toString();
 }
 
-void CSSValueList::collectSubresourceURLs(ListHashSet<KURL>& urls, const StyleSheetContents* styleSheet) const
+void CSSValueList::addSubresourceStyleURLs(ListHashSet<KURL>& urls, const StyleSheetContents* styleSheet) const
 {
     size_t size = m_values.size();
     for (size_t i = 0; i < size; ++i)
-        m_values[i]->collectSubresourceURLs(urls, styleSheet);
+        m_values[i]->addSubresourceStyleURLs(urls, styleSheet);
 }
 
 CSSValueList::CSSValueList(const CSSValueList& cloneFrom)
index cad6335..a4c59b4 100644 (file)
@@ -60,7 +60,7 @@ public:
 
     String customCssText() const;
 
-    void collectSubresourceURLs(ListHashSet<KURL>&, const StyleSheetContents*) const;
+    void addSubresourceStyleURLs(ListHashSet<KURL>&, const StyleSheetContents*) const;
     
     PassRefPtr<CSSValueList> cloneForCSSOM() const;
 
index ebc81d2..786aec5 100644 (file)
@@ -875,11 +875,11 @@ void StylePropertySet::merge(const StylePropertySet* other, bool argOverridesOnC
     }
 }
 
-void StylePropertySet::collectSubresourceURLs(ListHashSet<KURL>& urls, StyleSheetContents* contextStyleSheet) const
+void StylePropertySet::addSubresourceStyleURLs(ListHashSet<KURL>& urls, StyleSheetContents* contextStyleSheet) const
 {
     unsigned size = propertyCount();
     for (unsigned i = 0; i < size; ++i)
-        propertyAt(i).value()->collectSubresourceURLs(urls, contextStyleSheet);
+        propertyAt(i).value()->addSubresourceStyleURLs(urls, contextStyleSheet);
 }
 
 // This is the list of properties we want to copy in the copyBlockProperties() function.
index b4c01fc..31f6fb4 100644 (file)
@@ -90,7 +90,7 @@ public:
     void setCSSParserMode(CSSParserMode);
     CSSParserMode cssParserMode() const { return static_cast<CSSParserMode>(m_cssParserMode); }
 
-    void collectSubresourceURLs(ListHashSet<KURL>&, StyleSheetContents* contextStyleSheet) const;
+    void addSubresourceStyleURLs(ListHashSet<KURL>&, StyleSheetContents* contextStyleSheet) const;
 
     PassRefPtr<StylePropertySet> copy() const;
 
index bee210c..970c828 100644 (file)
@@ -384,7 +384,7 @@ KURL StyleSheetContents::completeURL(const String& url) const
     return CSSParser::completeURL(m_parserContext, url);
 }
 
-void StyleSheetContents::collectSubresourceURLs(ListHashSet<KURL>& urls)
+void StyleSheetContents::addSubresourceStyleURLs(ListHashSet<KURL>& urls)
 {
     Deque<StyleSheetContents*> styleSheetQueue;
     styleSheetQueue.append(this);
@@ -402,9 +402,9 @@ void StyleSheetContents::collectSubresourceURLs(ListHashSet<KURL>& urls)
         for (unsigned i = 0; i < styleSheet->m_childRules.size(); ++i) {
             StyleRuleBase* rule = styleSheet->m_childRules[i].get();
             if (rule->isStyleRule())
-                static_cast<StyleRule*>(rule)->properties()->collectSubresourceURLs(urls, this);
+                static_cast<StyleRule*>(rule)->properties()->addSubresourceStyleURLs(urls, this);
             else if (rule->isFontFaceRule())
-                static_cast<StyleRuleFontFace*>(rule)->properties()->collectSubresourceURLs(urls, this);
+                static_cast<StyleRuleFontFace*>(rule)->properties()->addSubresourceStyleURLs(urls, this);
         }
     }
 }
index 0325dff..7df34b7 100644 (file)
@@ -80,7 +80,7 @@ public:
     bool loadCompleted() const { return m_loadCompleted; }
 
     KURL completeURL(const String& url) const;
-    void collectSubresourceURLs(ListHashSet<KURL>&);
+    void addSubresourceStyleURLs(ListHashSet<KURL>&);
 
     void setIsUserStyleSheet(bool b) { m_isUserStyleSheet = b; }
     bool isUserStyleSheet() const { return m_isUserStyleSheet; }
index 363152b..fa39a18 100644 (file)
@@ -418,8 +418,6 @@ public:
     IntSize savedLayerScrollOffset() const;
     void setSavedLayerScrollOffset(const IntSize&);
 
-    virtual void collectSubresourceURLsFromAttributes(ListHashSet<KURL>&) const { }
-
 protected:
     Element(const QualifiedName& tagName, Document* document, ConstructionType type)
         : ContainerNode(document, type)
index d40ee0d..79450c5 100644 (file)
@@ -2423,9 +2423,7 @@ bool NodeListsNodeData::isEmpty() const
 
 void Node::getSubresourceURLs(ListHashSet<KURL>& urls) const
 {
-    if (!isElementNode())
-        return;
-    static_cast<const Element*>(this)->collectSubresourceURLsFromAttributes(urls);
+    addSubresourceAttributeURLs(urls);
 }
 
 Node* Node::enclosingLinkEventParentOrSelf()
index 09ab113..d8c62ee 100644 (file)
@@ -727,6 +727,7 @@ protected:
 
     virtual void didMoveToNewDocument(Document* oldDocument);
     
+    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const { }
     void setTabIndexExplicitly(short);
     void clearTabIndexExplicitly();
     
@@ -821,7 +822,7 @@ protected:
 #endif
 };
 
-// Used in Node::collectSubresourceURLsFromAttributes() and in collectSubresourceURLs()
+// Used in Node::addSubresourceAttributeURLs() and in addSubresourceStyleURLs()
 inline void addSubresourceURL(ListHashSet<KURL>& urls, const KURL& url)
 {
     if (!url.isNull())
index 62ce023..0943643 100644 (file)
@@ -280,7 +280,7 @@ int ProcessingInstruction::maxCharacterOffset() const
     return static_cast<int>(m_data.length());
 }
 
-void ProcessingInstruction::collectSubresourceURLsFromAttributes(ListHashSet<KURL>& urls) const
+void ProcessingInstruction::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {
     if (!sheet())
         return;
index 459909e..e331e21 100644 (file)
@@ -76,7 +76,7 @@ private:
     bool isLoading() const;
     virtual bool sheetLoaded();
 
-    virtual void collectSubresourceURLsFromAttributes(ListHashSet<KURL>&) const;
+    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
 
     void parseStyleSheet(const String& sheet);
 
index 8ad9305..a2bed3f 100644 (file)
@@ -239,10 +239,10 @@ bool StyledElement::removeInlineStyleProperty(CSSPropertyID propertyID)
     return changes;
 }
 
-void StyledElement::collectSubresourceURLsFromAttributes(ListHashSet<KURL>& urls) const
+void StyledElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {
     if (StylePropertySet* inlineStyle = attributeData() ? attributeData()->inlineStyle() : 0)
-        inlineStyle->collectSubresourceURLs(urls, document()->elementSheet()->contents());
+        inlineStyle->addSubresourceStyleURLs(urls, document()->elementSheet()->contents());
 }
 
 static inline bool attributeNameSort(const pair<AtomicStringImpl*, AtomicString>& p1, const pair<AtomicStringImpl*, AtomicString>& p2)
index f845051..4736a98 100644 (file)
@@ -74,7 +74,7 @@ protected:
     void addPropertyToAttributeStyle(StylePropertySet*, CSSPropertyID, double value, CSSPrimitiveValue::UnitTypes);
     void addPropertyToAttributeStyle(StylePropertySet*, CSSPropertyID, const String& value);
 
-    virtual void collectSubresourceURLsFromAttributes(ListHashSet<KURL>&) const;
+    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
 
     // classAttributeChanged() exists to share code between
     // parseAttribute (called via setAttribute()) and
index b98e7b6..846e331 100644 (file)
@@ -317,9 +317,9 @@ int HTMLBodyElement::scrollWidth()
     return view ? adjustForZoom(view->contentsWidth(), document) : 0;    
 }
 
-void HTMLBodyElement::collectSubresourceURLsFromAttributes(ListHashSet<KURL>& urls) const
+void HTMLBodyElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {
-    HTMLElement::collectSubresourceURLsFromAttributes(urls);
+    HTMLElement::addSubresourceAttributeURLs(urls);
 
     addSubresourceURL(urls, document()->completeURL(getAttribute(backgroundAttr)));
 }
index 7a40c24..22ac19c 100644 (file)
@@ -90,7 +90,7 @@ private:
     virtual int scrollHeight();
     virtual int scrollWidth();
     
-    virtual void collectSubresourceURLsFromAttributes(ListHashSet<KURL>&) const;
+    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
 };
 
 } //namespace
index 256bcd7..b9c6e41 100644 (file)
@@ -216,9 +216,9 @@ const QualifiedName& HTMLEmbedElement::imageSourceAttributeName() const
     return srcAttr;
 }
 
-void HTMLEmbedElement::collectSubresourceURLsFromAttributes(ListHashSet<KURL>& urls) const
+void HTMLEmbedElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {
-    HTMLPlugInImageElement::collectSubresourceURLsFromAttributes(urls);
+    HTMLPlugInImageElement::addSubresourceAttributeURLs(urls);
 
     addSubresourceURL(urls, document()->completeURL(getAttribute(srcAttr)));
 }
index 05259fc..ba828a1 100644 (file)
@@ -47,7 +47,7 @@ private:
 
     virtual void updateWidget(PluginCreationOption);
 
-    virtual void collectSubresourceURLsFromAttributes(ListHashSet<KURL>&) const;
+    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
 
     void parametersForPlugin(Vector<String>& paramNames, Vector<String>& paramValues);
 
index 2476686..012d9ec 100644 (file)
@@ -325,9 +325,9 @@ bool HTMLImageElement::complete() const
     return m_imageLoader.imageComplete();
 }
 
-void HTMLImageElement::collectSubresourceURLsFromAttributes(ListHashSet<KURL>& urls) const
+void HTMLImageElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {
-    HTMLElement::collectSubresourceURLsFromAttributes(urls);
+    HTMLElement::addSubresourceAttributeURLs(urls);
 
     addSubresourceURL(urls, src());
     // FIXME: What about when the usemap attribute begins with "#"?
index bda8810..9c6ff5a 100644 (file)
@@ -97,7 +97,7 @@ private:
 
     virtual bool draggable() const;
 
-    virtual void collectSubresourceURLsFromAttributes(ListHashSet<KURL>&) const;
+    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
 
     virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE;
     virtual void removedFrom(ContainerNode*) OVERRIDE;
index 43de81f..3950cd0 100644 (file)
@@ -1378,9 +1378,9 @@ void HTMLInputElement::didMoveToNewDocument(Document* oldDocument)
     HTMLTextFormControlElement::didMoveToNewDocument(oldDocument);
 }
 
-void HTMLInputElement::collectSubresourceURLsFromAttributes(ListHashSet<KURL>& urls) const
+void HTMLInputElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {
-    HTMLTextFormControlElement::collectSubresourceURLsFromAttributes(urls);
+    HTMLTextFormControlElement::addSubresourceAttributeURLs(urls);
 
     addSubresourceURL(urls, src());
 }
index d63a83c..56a8641 100644 (file)
@@ -316,7 +316,7 @@ private:
 
     virtual void documentDidResumeFromPageCache();
 
-    virtual void collectSubresourceURLsFromAttributes(ListHashSet<KURL>&) const;
+    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
 
     bool needsSuspensionCallback();
     void registerForSuspensionCallbackIfNeeded();
index 50075c0..f378de5 100644 (file)
@@ -418,9 +418,9 @@ String HTMLLinkElement::type() const
     return getAttribute(typeAttr);
 }
 
-void HTMLLinkElement::collectSubresourceURLsFromAttributes(ListHashSet<KURL>& urls) const
+void HTMLLinkElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {
-    HTMLElement::collectSubresourceURLsFromAttributes(urls);
+    HTMLElement::addSubresourceAttributeURLs(urls);
 
     // Favicons are handled by a special case in LegacyWebArchive::create()
     if (m_relAttribute.m_iconType != InvalidIcon)
@@ -434,7 +434,7 @@ void HTMLLinkElement::collectSubresourceURLsFromAttributes(ListHashSet<KURL>& ur
     
     // Walk the URLs linked by the linked-to stylesheet.
     if (CSSStyleSheet* styleSheet = const_cast<HTMLLinkElement*>(this)->sheet())
-        styleSheet->contents()->collectSubresourceURLs(urls);
+        styleSheet->contents()->addSubresourceStyleURLs(urls);
 }
 
 void HTMLLinkElement::addPendingSheet(PendingSheetType type)
index f72cfd2..bb69e12 100644 (file)
@@ -94,7 +94,7 @@ private:
     virtual bool isURLAttribute(const Attribute&) const OVERRIDE;
 
 private:
-    virtual void collectSubresourceURLsFromAttributes(ListHashSet<KURL>&) const;
+    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
 
     virtual void finishParsingChildren();
     
index 5096755..024e825 100644 (file)
@@ -467,9 +467,9 @@ bool HTMLObjectElement::containsJavaApplet() const
     return false;
 }
 
-void HTMLObjectElement::collectSubresourceURLsFromAttributes(ListHashSet<KURL>& urls) const
+void HTMLObjectElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {
-    HTMLPlugInImageElement::collectSubresourceURLsFromAttributes(urls);
+    HTMLPlugInImageElement::addSubresourceAttributeURLs(urls);
 
     addSubresourceURL(urls, document()->completeURL(getAttribute(dataAttr)));
 
index 3b1a953..c44da02 100644 (file)
@@ -83,7 +83,7 @@ private:
 
     virtual RenderWidget* renderWidgetForJSBindings();
 
-    virtual void collectSubresourceURLsFromAttributes(ListHashSet<KURL>&) const;
+    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
 
     virtual void updateWidget(PluginCreationOption);
     void updateDocNamedItem();
index 7190123..9f609ce 100644 (file)
@@ -66,9 +66,9 @@ bool HTMLParamElement::isURLAttribute(const Attribute& attribute) const
     return HTMLElement::isURLAttribute(attribute);
 }
 
-void HTMLParamElement::collectSubresourceURLsFromAttributes(ListHashSet<KURL>& urls) const
+void HTMLParamElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {
-    HTMLElement::collectSubresourceURLsFromAttributes(urls);
+    HTMLElement::addSubresourceAttributeURLs(urls);
 
     if (!isURLParameter(name()))
         return;
index a8c7778..f868e13 100644 (file)
@@ -41,7 +41,7 @@ private:
 
     virtual bool isURLAttribute(const Attribute&) const OVERRIDE;
 
-    virtual void collectSubresourceURLsFromAttributes(ListHashSet<KURL>&) const;
+    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
 };
 
 } // namespace WebCore
index 13f8561..4f2c956 100644 (file)
@@ -113,9 +113,9 @@ KURL HTMLScriptElement::src() const
     return document()->completeURL(sourceAttributeValue());
 }
 
-void HTMLScriptElement::collectSubresourceURLsFromAttributes(ListHashSet<KURL>& urls) const
+void HTMLScriptElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {
-    HTMLElement::collectSubresourceURLsFromAttributes(urls);
+    HTMLElement::addSubresourceAttributeURLs(urls);
 
     addSubresourceURL(urls, src());
 }
index f905fbf..c2ca0db 100644 (file)
@@ -50,7 +50,7 @@ private:
 
     virtual bool isURLAttribute(const Attribute&) const OVERRIDE;
 
-    virtual void collectSubresourceURLsFromAttributes(ListHashSet<KURL>&) const;
+    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
 
     virtual String sourceAttributeValue() const;
     virtual String charsetAttributeValue() const;
index d6e74e8..67ddceb 100644 (file)
@@ -246,12 +246,12 @@ void HTMLStyleElement::notifyLoadedSheetAndAllCriticalSubresources(bool errorOcc
     m_firedLoad = true;
 }
 
-void HTMLStyleElement::collectSubresourceURLsFromAttributes(ListHashSet<KURL>& urls) const
+void HTMLStyleElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {    
-    HTMLElement::collectSubresourceURLsFromAttributes(urls);
+    HTMLElement::addSubresourceAttributeURLs(urls);
 
     if (CSSStyleSheet* styleSheet = const_cast<HTMLStyleElement*>(this)->sheet())
-        styleSheet->contents()->collectSubresourceURLs(urls);
+        styleSheet->contents()->addSubresourceStyleURLs(urls);
 }
 
 bool HTMLStyleElement::disabled() const
index 3222b53..7e31254 100644 (file)
@@ -71,7 +71,7 @@ private:
     virtual void notifyLoadedSheetAndAllCriticalSubresources(bool errorOccurred);
     virtual void startLoadingDynamicSheet() { StyleElement::startLoadingDynamicSheet(document()); }
 
-    virtual void collectSubresourceURLsFromAttributes(ListHashSet<KURL>&) const;
+    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
 
     virtual const AtomicString& media() const;
     virtual const AtomicString& type() const;
index 8d2ee73..c75ecc8 100644 (file)
@@ -156,9 +156,9 @@ String HTMLTableCellElement::scope() const
     return getAttribute(scopeAttr);
 }
 
-void HTMLTableCellElement::collectSubresourceURLsFromAttributes(ListHashSet<KURL>& urls) const
+void HTMLTableCellElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {
-    HTMLTablePartElement::collectSubresourceURLsFromAttributes(urls);
+    HTMLTablePartElement::addSubresourceAttributeURLs(urls);
 
     addSubresourceURL(urls, document()->completeURL(getAttribute(backgroundAttr)));
 }
index 8cba939..5213e1c 100644 (file)
@@ -61,7 +61,7 @@ private:
 
     virtual bool isURLAttribute(const Attribute&) const OVERRIDE;
 
-    virtual void collectSubresourceURLsFromAttributes(ListHashSet<KURL>&) const;
+    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
 };
 
 HTMLTableCellElement* toHTMLTableCellElement(Node* node);
index af61e28..a6fa17d 100644 (file)
@@ -582,9 +582,9 @@ String HTMLTableElement::summary() const
     return getAttribute(summaryAttr);
 }
 
-void HTMLTableElement::collectSubresourceURLsFromAttributes(ListHashSet<KURL>& urls) const
+void HTMLTableElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {
-    HTMLElement::collectSubresourceURLsFromAttributes(urls);
+    HTMLElement::addSubresourceAttributeURLs(urls);
 
     addSubresourceURL(urls, document()->completeURL(getAttribute(backgroundAttr)));
 }
index 4e4c02f..d492b54 100644 (file)
@@ -79,7 +79,7 @@ private:
     // Used to obtain either a solid or outset border decl and to deal with the frame and rules attributes.
     virtual StylePropertySet* additionalAttributeStyle() OVERRIDE;
 
-    virtual void collectSubresourceURLsFromAttributes(ListHashSet<KURL>&) const;
+    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
 
     enum TableRules { UnsetRules, NoneRules, GroupsRules, RowsRules, ColsRules, AllRules };
     enum CellBorders { NoBorders, SolidBorders, InsetBorders, SolidBordersColsOnly, SolidBordersRowsOnly };
index ca01ec9..f58816b 100644 (file)
@@ -134,9 +134,9 @@ void SVGCursorElement::svgAttributeChanged(const QualifiedName& attrName)
         (*it)->setNeedsStyleRecalc();
 }
 
-void SVGCursorElement::collectSubresourceURLsFromAttributes(ListHashSet<KURL>& urls) const
+void SVGCursorElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {
-    SVGElement::collectSubresourceURLsFromAttributes(urls);
+    SVGElement::addSubresourceAttributeURLs(urls);
 
     addSubresourceURL(urls, document()->completeURL(href()));
 }
index e81c9ff..68757ab 100644 (file)
@@ -54,7 +54,7 @@ private:
     virtual void parseAttribute(const Attribute&) OVERRIDE;
     virtual void svgAttributeChanged(const QualifiedName&);
 
-    virtual void collectSubresourceURLsFromAttributes(ListHashSet<KURL>&) const;
+    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
 
     BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGCursorElement)
         DECLARE_ANIMATED_LENGTH(X, x)
index a2ee710..75d0b43 100644 (file)
@@ -210,9 +210,9 @@ PassRefPtr<FilterEffect> SVGFEImageElement::build(SVGFilterBuilder*, Filter* fil
     return FEImage::createWithIRIReference(filter, document(), href(), preserveAspectRatio());
 }
 
-void SVGFEImageElement::collectSubresourceURLsFromAttributes(ListHashSet<KURL>& urls) const
+void SVGFEImageElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {
-    SVGFilterPrimitiveStandardAttributes::collectSubresourceURLsFromAttributes(urls);
+    SVGFilterPrimitiveStandardAttributes::addSubresourceAttributeURLs(urls);
 
     addSubresourceURL(urls, document()->completeURL(href()));
 }
index 740acc0..de60642 100644 (file)
@@ -53,7 +53,7 @@ private:
     virtual void svgAttributeChanged(const QualifiedName&);
     virtual void notifyFinished(CachedResource*);
 
-    virtual void collectSubresourceURLsFromAttributes(ListHashSet<KURL>&) const;
+    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
     virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*, Filter*);
 
     void clearResourceReferences();
index 000fd08..5558d10 100644 (file)
@@ -227,9 +227,9 @@ const QualifiedName& SVGImageElement::imageSourceAttributeName() const
     return XLinkNames::hrefAttr;
 }
 
-void SVGImageElement::collectSubresourceURLsFromAttributes(ListHashSet<KURL>& urls) const
+void SVGImageElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {
-    SVGStyledTransformableElement::collectSubresourceURLsFromAttributes(urls);
+    SVGStyledTransformableElement::addSubresourceAttributeURLs(urls);
 
     addSubresourceURL(urls, document()->completeURL(href()));
 }
index f28a9f4..f2f8d9b 100644 (file)
@@ -60,7 +60,7 @@ private:
     virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
  
     virtual const QualifiedName& imageSourceAttributeName() const;       
-    virtual void collectSubresourceURLsFromAttributes(ListHashSet<KURL>&) const;
+    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
 
     virtual bool haveLoadedRequiredResources();
 
index 53fd4b8..ff9834c 100644 (file)
@@ -153,9 +153,9 @@ void SVGScriptElement::setType(const String& type)
     m_type = type;
 }
 
-void SVGScriptElement::collectSubresourceURLsFromAttributes(ListHashSet<KURL>& urls) const
+void SVGScriptElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {
-    SVGElement::collectSubresourceURLsFromAttributes(urls);
+    SVGElement::addSubresourceAttributeURLs(urls);
 
     addSubresourceURL(urls, document()->completeURL(href()));
 }
index 06af648..503598f 100644 (file)
@@ -53,7 +53,7 @@ private:
     virtual bool isURLAttribute(const Attribute&) const OVERRIDE;
     virtual void finishParsingChildren();
 
-    virtual void collectSubresourceURLsFromAttributes(ListHashSet<KURL>&) const;
+    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
 
     virtual bool haveLoadedRequiredResources() { return SVGExternalResourcesRequired::haveLoadedRequiredResources(); }