Changeset 190842 in webkit

Timestamp:

Oct 10, 2015 2:13:15 PM (9 years ago)

Author:

akling@apple.com

Message:

Reduce pointless malloc traffic in ElementRuleCollector.
<​https://webkit.org/b/150003>

Reviewed by Antti Koivisto.

Don't use a unique_ptr for the m_matchedRules vector in ElementRuleCollector.
This is one of our heaviest sources of transient allocations, with ~88000
malloc/free pairs on loading theverge.com.

• css/ElementRuleCollector.cpp:

(WebCore::ElementRuleCollector::addMatchedRule):
(WebCore::ElementRuleCollector::clearMatchedRules):
(WebCore::ElementRuleCollector::sortAndTransferMatchedRules):
(WebCore::ElementRuleCollector::sortMatchedRules):
(WebCore::ElementRuleCollector::hasAnyMatchingRules):

• css/ElementRuleCollector.h:

(WebCore::ElementRuleCollector::hasMatchedRules):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/ElementRuleCollector.cpp (modified) (5 diffs)
• css/ElementRuleCollector.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-10-10  Andreas Kling  <akling@apple.com>
+
+        Reduce pointless malloc traffic in ElementRuleCollector.
+        <https://webkit.org/b/150003>
+
+        Reviewed by Antti Koivisto.
+
+        Don't use a unique_ptr for the m_matchedRules vector in ElementRuleCollector.
+        This is one of our heaviest sources of transient allocations, with ~88000
+        malloc/free pairs on loading theverge.com.
+
+        * css/ElementRuleCollector.cpp:
+        (WebCore::ElementRuleCollector::addMatchedRule):
+        (WebCore::ElementRuleCollector::clearMatchedRules):
+        (WebCore::ElementRuleCollector::sortAndTransferMatchedRules):
+        (WebCore::ElementRuleCollector::sortMatchedRules):
+        (WebCore::ElementRuleCollector::hasAnyMatchingRules):
+        * css/ElementRuleCollector.h:
+        (WebCore::ElementRuleCollector::hasMatchedRules):
+
 2015-10-10  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/css/ElementRuleCollector.cpp

@@ -90 +90 @@
 inline void ElementRuleCollector::addMatchedRule(const MatchedRule& matchedRule)
 {
-    if (!m_matchedRules)
-        m_matchedRules = std::make_unique<Vector<MatchedRule, 32>>();
-    m_matchedRules->append(matchedRule);
+    m_matchedRules.append(matchedRule);
 }
 
 void ElementRuleCollector::clearMatchedRules()
 {
-    if (!m_matchedRules)
-        return;
-    m_matchedRules->clear();
+    m_matchedRules.clear();
 }
 
@@ -167 +163 @@
 void ElementRuleCollector::sortAndTransferMatchedRules()
 {
-    if (!m_matchedRules || m_matchedRules->isEmpty())
+    if (m_matchedRules.isEmpty())
         return;
 
     sortMatchedRules();
 
-    Vector<MatchedRule, 32>& matchedRules = *m_matchedRules;
     if (m_mode == SelectorChecker::Mode::CollectingRules) {
-        for (const MatchedRule& matchedRule : matchedRules)
+        for (const MatchedRule& matchedRule : m_matchedRules)
             m_matchedRuleList.append(matchedRule.ruleData->rule());
         return;
@@ -180 +175 @@
 
     // Now transfer the set of matched rules over to our list of declarations.
-    for (const MatchedRule& matchedRule : matchedRules) {
+    for (const MatchedRule& matchedRule : m_matchedRules) {
         if (m_style && matchedRule.ruleData->containsUncommonAttributeSelector())
             m_style->setUnique();
@@ -394 +389 @@
 void ElementRuleCollector::sortMatchedRules()
 {
-    ASSERT(m_matchedRules);
-    std::sort(m_matchedRules->begin(), m_matchedRules->end(), compareRules);
+    std::sort(m_matchedRules.begin(), m_matchedRules.end(), compareRules);
 }
 
@@ -454 +448 @@
     collectMatchingRules(MatchRequest(ruleSet), ruleRange);
 
-    return m_matchedRules && !m_matchedRules->isEmpty();
+    return !m_matchedRules.isEmpty();
 }
 

trunk/Source/WebCore/css/ElementRuleCollector.h

@@ -71 +71 @@
     const Vector<RefPtr<StyleRule>>& matchedRuleList() const;
 
-    bool hasMatchedRules() const { return m_matchedRules && !m_matchedRules->isEmpty(); }
+    bool hasMatchedRules() const { return !m_matchedRules.isEmpty(); }
     void clearMatchedRules();
 
@@ -104 +104 @@
     bool m_canUseFastReject;
 
-    std::unique_ptr<Vector<MatchedRule, 32>> m_matchedRules;
+    Vector<MatchedRule, 64> m_matchedRules;
 
     // Output.