Title: [97489] trunk/Source/WebCore
- Revision
- 97489
- Author
- [email protected]
- Date
- 2011-10-14 11:54:36 -0700 (Fri, 14 Oct 2011)
Log Message
Don't assert that CSSRules are CSSRules.
Rubber-stamped by Antti Koivisto.
* css/CSSRule.h:
(WebCore::CSSRule::isRule):
* css/CSSStyleSheet.cpp:
(WebCore::CSSStyleSheet::append):
(WebCore::CSSStyleSheet::insert):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (97488 => 97489)
--- trunk/Source/WebCore/ChangeLog 2011-10-14 18:48:35 UTC (rev 97488)
+++ trunk/Source/WebCore/ChangeLog 2011-10-14 18:54:36 UTC (rev 97489)
@@ -1,3 +1,15 @@
+2011-10-14 Andreas Kling <[email protected]>
+
+ Don't assert that CSSRules are CSSRules.
+
+ Rubber-stamped by Antti Koivisto.
+
+ * css/CSSRule.h:
+ (WebCore::CSSRule::isRule):
+ * css/CSSStyleSheet.cpp:
+ (WebCore::CSSStyleSheet::append):
+ (WebCore::CSSStyleSheet::insert):
+
2011-10-14 Beth Dakin <[email protected]>
Attempted Leopard build fix.
Modified: trunk/Source/WebCore/css/CSSRule.h (97488 => 97489)
--- trunk/Source/WebCore/css/CSSRule.h 2011-10-14 18:48:35 UTC (rev 97488)
+++ trunk/Source/WebCore/css/CSSRule.h 2011-10-14 18:54:36 UTC (rev 97489)
@@ -56,13 +56,14 @@
virtual void addSubresourceStyleURLs(ListHashSet<KURL>&) { }
- virtual bool isRule() const { return true; }
-
protected:
CSSRule(CSSStyleSheet* parent)
: StyleBase(parent)
{
}
+
+private:
+ virtual bool isRule() const { return true; }
};
} // namespace WebCore
Modified: trunk/Source/WebCore/css/CSSStyleSheet.cpp (97488 => 97489)
--- trunk/Source/WebCore/css/CSSStyleSheet.cpp 2011-10-14 18:48:35 UTC (rev 97488)
+++ trunk/Source/WebCore/css/CSSStyleSheet.cpp 2011-10-14 18:54:36 UTC (rev 97489)
@@ -97,7 +97,6 @@
void CSSStyleSheet::append(PassRefPtr<CSSRule> child)
{
CSSRule* c = child.get();
- ASSERT(c->isRule());
m_children.append(child);
c->insertedIntoParent();
}
@@ -105,7 +104,6 @@
void CSSStyleSheet::insert(unsigned index, PassRefPtr<CSSRule> child)
{
CSSRule* c = child.get();
- ASSERT(c->isRule());
if (index >= length())
m_children.append(child);
else
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
