am 3c54ece0: am 5dc34a85: activeDocumentLoader() causes crash in WebCoreFrameBridge.cpp

[android-x86/external-webkit.git] / WebCore / css / CSSStyleRule.cpp

diff --git a/WebCore/css/CSSStyleRule.cpp b/WebCore/css/CSSStyleRule.cpp
index 4f08759..1036e8f 100644 (file)
--- a/WebCore/css/CSSStyleRule.cpp
+++ b/WebCore/css/CSSStyleRule.cpp
@@ -27,9 +27,9 @@
 
 namespace WebCore {
 
-CSSStyleRule::CSSStyleRule(CSSStyleSheet* parent)
+CSSStyleRule::CSSStyleRule(CSSStyleSheet* parent, int sourceLine)
     : CSSRule(parent)
-    , m_selector(0)
+    , m_sourceLine(sourceLine)
 {
 }
 
@@ -37,21 +37,17 @@ CSSStyleRule::~CSSStyleRule()
 {
     if (m_style)
         m_style->setParent(0);
-    delete m_selector;
 }
 
 String CSSStyleRule::selectorText() const
 {
-    if (m_selector) {
-        String str;
-        for (CSSSelector* s = m_selector; s; s = s->next()) {
-            if (s != m_selector)
-                str += ", ";
-            str += s->selectorText();
-        }
-        return str;
+    String str;
+    for (CSSSelector* s = selectorList().first(); s; s = CSSSelectorList::next(s)) {
+        if (s != selectorList().first())
+            str += ", ";
+        str += s->selectorText();
     }
-    return String();
+    return str;
 }
 
 void CSSStyleRule::setSelectorText(const String& /*selectorText*/, ExceptionCode& /*ec*/)
@@ -81,4 +77,10 @@ void CSSStyleRule::setDeclaration(PassRefPtr<CSSMutableStyleDeclaration> style)
     m_style = style;
 }
 
+void CSSStyleRule::addSubresourceStyleURLs(ListHashSet<KURL>& urls)
+{
+    if (m_style)
+        m_style->addSubresourceStyleURLs(urls);
+}
+
 } // namespace WebCore