Title: [98967] trunk/Source/WebCore
- Revision
- 98967
- Author
- andreas.kl...@nokia.com
- Date
- 2011-11-01 08:47:51 -0700 (Tue, 01 Nov 2011)
Log Message
CSSStyleSheet: Operate directly on the rule vector internally.
Rubber-stamped by Antti Koivisto.
There's no need to go through the public, range-checking item() method
working on m_children. Also changed length() -> m_children.size().
* css/CSSStyleSheet.cpp:
(WebCore::CSSStyleSheet::~CSSStyleSheet):
(WebCore::CSSStyleSheet::insertRule):
(WebCore::CSSStyleSheet::addRule):
(WebCore::CSSStyleSheet::deleteRule):
(WebCore::CSSStyleSheet::isLoading):
(WebCore::CSSStyleSheet::addSubresourceStyleURLs):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (98966 => 98967)
--- trunk/Source/WebCore/ChangeLog 2011-11-01 15:44:03 UTC (rev 98966)
+++ trunk/Source/WebCore/ChangeLog 2011-11-01 15:47:51 UTC (rev 98967)
@@ -1,5 +1,22 @@
2011-11-01 Andreas Kling <kl...@webkit.org>
+ CSSStyleSheet: Operate directly on the rule vector internally.
+
+ Rubber-stamped by Antti Koivisto.
+
+ There's no need to go through the public, range-checking item() method
+ working on m_children. Also changed length() -> m_children.size().
+
+ * css/CSSStyleSheet.cpp:
+ (WebCore::CSSStyleSheet::~CSSStyleSheet):
+ (WebCore::CSSStyleSheet::insertRule):
+ (WebCore::CSSStyleSheet::addRule):
+ (WebCore::CSSStyleSheet::deleteRule):
+ (WebCore::CSSStyleSheet::isLoading):
+ (WebCore::CSSStyleSheet::addSubresourceStyleURLs):
+
+2011-11-01 Andreas Kling <kl...@webkit.org>
+
CSSRule: Devirtualize addSubresourceStyleURLs()
https://bugs.webkit.org/show_bug.cgi?id=71285
Modified: trunk/Source/WebCore/css/CSSStyleSheet.cpp (98966 => 98967)
--- trunk/Source/WebCore/css/CSSStyleSheet.cpp 2011-11-01 15:44:03 UTC (rev 98966)
+++ trunk/Source/WebCore/css/CSSStyleSheet.cpp 2011-11-01 15:47:51 UTC (rev 98967)
@@ -80,9 +80,9 @@
// For style rules outside the document, .parentStyleSheet can become null even if the style rule
// is still observable from _javascript_. This matches the behavior of .parentNode for nodes, but
// it's not ideal because it makes the CSSOM's behavior depend on the timing of garbage collection.
- for (unsigned i = 0; i < length(); ++i) {
- ASSERT(item(i)->parentStyleSheet() == this);
- item(i)->setParentStyleSheet(0);
+ for (unsigned i = 0; i < m_children.size(); ++i) {
+ ASSERT(m_children.at(i)->parentStyleSheet() == this);
+ m_children.at(i)->setParentStyleSheet(0);
}
}
@@ -107,7 +107,7 @@
unsigned CSSStyleSheet::insertRule(const String& rule, unsigned index, ExceptionCode& ec)
{
ec = 0;
- if (index > length()) {
+ if (index > m_children.size()) {
ec = INDEX_SIZE_ERR;
return 0;
}
@@ -125,7 +125,7 @@
if (r->isImportRule()) {
// Check all the rules that come before this one to make sure they are only @charset and @import rules.
for (unsigned i = 0; i < index; ++i) {
- if (!item(i)->isCharsetRule() && !item(i)->isImportRule()) {
+ if (!m_children.at(i)->isCharsetRule() && !m_children.at(i)->isImportRule()) {
ec = HIERARCHY_REQUEST_ERR;
return 0;
}
@@ -157,7 +157,7 @@
int CSSStyleSheet::addRule(const String& selector, const String& style, ExceptionCode& ec)
{
- return addRule(selector, style, length(), ec);
+ return addRule(selector, style, m_children.size(), ec);
}
PassRefPtr<CSSRuleList> CSSStyleSheet::cssRules(bool omitCharsetRules)
@@ -170,13 +170,13 @@
void CSSStyleSheet::deleteRule(unsigned index, ExceptionCode& ec)
{
- if (index >= length()) {
+ if (index >= m_children.size()) {
ec = INDEX_SIZE_ERR;
return;
}
ec = 0;
- item(index)->setParentStyleSheet(0);
+ m_children.at(index)->setParentStyleSheet(0);
m_children.remove(index);
styleSheetChanged();
}
@@ -222,9 +222,8 @@
bool CSSStyleSheet::isLoading()
{
- unsigned len = length();
- for (unsigned i = 0; i < len; ++i) {
- CSSRule* rule = item(i);
+ for (unsigned i = 0; i < m_children.size(); ++i) {
+ CSSRule* rule = m_children.at(i).get();
if (rule->isImportRule() && static_cast<CSSImportRule*>(rule)->isLoading())
return true;
}
@@ -293,8 +292,8 @@
while (!styleSheetQueue.isEmpty()) {
CSSStyleSheet* styleSheet = styleSheetQueue.takeFirst();
- for (unsigned i = 0; i < styleSheet->length(); ++i) {
- CSSRule* rule = styleSheet->item(i);
+ for (unsigned i = 0; i < styleSheet->m_children.size(); ++i) {
+ CSSRule* rule = styleSheet->m_children.at(i).get();
if (rule->isImportRule()) {
if (CSSStyleSheet* ruleStyleSheet = static_cast<CSSImportRule*>(rule)->styleSheet())
styleSheetQueue.append(ruleStyleSheet);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
