<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[178580] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/178580">178580</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-01-16 09:50:14 -0800 (Fri, 16 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Some improvements to RuleSet shrinking.
&lt;https://webkit.org/b/140534&gt;

Reviewed by Antti Koivisto.

Give an inline capacity (1) to the RuleData Vectors in RuleSet.
The vast majority of Vectors have only a single entry, and this
avoids having to allocate a separate Vector backing store for them.

Also make sure to shrink some Vectors that we weren't already,
like those in RuleFeatureSet.

* css/ElementRuleCollector.cpp:
(WebCore::ElementRuleCollector::collectMatchingRulesForList):
* css/ElementRuleCollector.h:
* css/RuleFeature.cpp:
(WebCore::RuleFeatureSet::shrinkToFit):
* css/RuleFeature.h:
* css/RuleSet.cpp:
(WebCore::RuleSet::addToRuleSet):
(WebCore::rulesCountForName):
(WebCore::shrinkMapVectorsToFit):
(WebCore::RuleSet::shrinkToFit):
* css/RuleSet.h:
(WebCore::RuleSet::idRules):
(WebCore::RuleSet::classRules):
(WebCore::RuleSet::tagRules):
(WebCore::RuleSet::shadowPseudoElementRules):
(WebCore::RuleSet::linkPseudoClassRules):
(WebCore::RuleSet::cuePseudoRules):
(WebCore::RuleSet::focusPseudoClassRules):
(WebCore::RuleSet::universalRules):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssElementRuleCollectorcpp">trunk/Source/WebCore/css/ElementRuleCollector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssElementRuleCollectorh">trunk/Source/WebCore/css/ElementRuleCollector.h</a></li>
<li><a href="#trunkSourceWebCorecssRuleFeaturecpp">trunk/Source/WebCore/css/RuleFeature.cpp</a></li>
<li><a href="#trunkSourceWebCorecssRuleFeatureh">trunk/Source/WebCore/css/RuleFeature.h</a></li>
<li><a href="#trunkSourceWebCorecssRuleSetcpp">trunk/Source/WebCore/css/RuleSet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssRuleSeth">trunk/Source/WebCore/css/RuleSet.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178579 => 178580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-01-16 17:13:03 UTC (rev 178579)
+++ trunk/Source/WebCore/ChangeLog        2015-01-16 17:50:14 UTC (rev 178580)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2015-01-16  Andreas Kling  &lt;akling@apple.com&gt;
+
+        Some improvements to RuleSet shrinking.
+        &lt;https://webkit.org/b/140534&gt;
+
+        Reviewed by Antti Koivisto.
+
+        Give an inline capacity (1) to the RuleData Vectors in RuleSet.
+        The vast majority of Vectors have only a single entry, and this
+        avoids having to allocate a separate Vector backing store for them.
+
+        Also make sure to shrink some Vectors that we weren't already,
+        like those in RuleFeatureSet.
+
+        * css/ElementRuleCollector.cpp:
+        (WebCore::ElementRuleCollector::collectMatchingRulesForList):
+        * css/ElementRuleCollector.h:
+        * css/RuleFeature.cpp:
+        (WebCore::RuleFeatureSet::shrinkToFit):
+        * css/RuleFeature.h:
+        * css/RuleSet.cpp:
+        (WebCore::RuleSet::addToRuleSet):
+        (WebCore::rulesCountForName):
+        (WebCore::shrinkMapVectorsToFit):
+        (WebCore::RuleSet::shrinkToFit):
+        * css/RuleSet.h:
+        (WebCore::RuleSet::idRules):
+        (WebCore::RuleSet::classRules):
+        (WebCore::RuleSet::tagRules):
+        (WebCore::RuleSet::shadowPseudoElementRules):
+        (WebCore::RuleSet::linkPseudoClassRules):
+        (WebCore::RuleSet::cuePseudoRules):
+        (WebCore::RuleSet::focusPseudoClassRules):
+        (WebCore::RuleSet::universalRules):
+
</ins><span class="cx"> 2015-01-16  Antti Koivisto  &lt;antti@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Correct naming for FontCascade implementation files
</span></span></pre></div>
<a id="trunkSourceWebCorecssElementRuleCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ElementRuleCollector.cpp (178579 => 178580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ElementRuleCollector.cpp        2015-01-16 17:13:03 UTC (rev 178579)
+++ trunk/Source/WebCore/css/ElementRuleCollector.cpp        2015-01-16 17:50:14 UTC (rev 178580)
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx">     return selectorChecker.match(ruleData.selector(), &amp;m_element, context, specificity);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ElementRuleCollector::collectMatchingRulesForList(const Vector&lt;RuleData&gt;* rules, const MatchRequest&amp; matchRequest, StyleResolver::RuleRange&amp; ruleRange)
</del><ins>+void ElementRuleCollector::collectMatchingRulesForList(const RuleSet::RuleDataVector* rules, const MatchRequest&amp; matchRequest, StyleResolver::RuleRange&amp; ruleRange)
</ins><span class="cx"> {
</span><span class="cx">     if (!rules)
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCorecssElementRuleCollectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ElementRuleCollector.h (178579 => 178580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ElementRuleCollector.h        2015-01-16 17:13:03 UTC (rev 178579)
+++ trunk/Source/WebCore/css/ElementRuleCollector.h        2015-01-16 17:50:14 UTC (rev 178580)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> 
</span><span class="cx">     void collectMatchingRules(const MatchRequest&amp;, StyleResolver::RuleRange&amp;);
</span><span class="cx">     void collectMatchingRulesForRegion(const MatchRequest&amp;, StyleResolver::RuleRange&amp;);
</span><del>-    void collectMatchingRulesForList(const Vector&lt;RuleData&gt;*, const MatchRequest&amp;, StyleResolver::RuleRange&amp;);
</del><ins>+    void collectMatchingRulesForList(const RuleSet::RuleDataVector*, const MatchRequest&amp;, StyleResolver::RuleRange&amp;);
</ins><span class="cx">     bool ruleMatches(const RuleData&amp;, unsigned &amp;specificity);
</span><span class="cx"> 
</span><span class="cx">     void sortMatchedRules();
</span></span></pre></div>
<a id="trunkSourceWebCorecssRuleFeaturecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RuleFeature.cpp (178579 => 178580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RuleFeature.cpp        2015-01-16 17:13:03 UTC (rev 178579)
+++ trunk/Source/WebCore/css/RuleFeature.cpp        2015-01-16 17:50:14 UTC (rev 178580)
</span><span class="lines">@@ -103,4 +103,10 @@
</span><span class="cx">     usesFirstLetterRules = false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void RuleFeatureSet::shrinkToFit()
+{
+    siblingRules.shrinkToFit();
+    uncommonAttributeRules.shrinkToFit();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssRuleFeatureh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RuleFeature.h (178579 => 178580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RuleFeature.h        2015-01-16 17:13:03 UTC (rev 178579)
+++ trunk/Source/WebCore/css/RuleFeature.h        2015-01-16 17:50:14 UTC (rev 178580)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> 
</span><span class="cx">     void add(const RuleFeatureSet&amp;);
</span><span class="cx">     void clear();
</span><del>-
</del><ins>+    void shrinkToFit();
</ins><span class="cx">     void collectFeaturesFromSelector(const CSSSelector&amp;, bool&amp; hasSiblingSelector);
</span><span class="cx"> 
</span><span class="cx">     HashSet&lt;AtomicStringImpl*&gt; idsInRules;
</span></span></pre></div>
<a id="trunkSourceWebCorecssRuleSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RuleSet.cpp (178579 => 178580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RuleSet.cpp        2015-01-16 17:13:03 UTC (rev 178579)
+++ trunk/Source/WebCore/css/RuleSet.cpp        2015-01-16 17:50:14 UTC (rev 178580)
</span><span class="lines">@@ -183,15 +183,15 @@
</span><span class="cx"> {
</span><span class="cx">     if (!key)
</span><span class="cx">         return;
</span><del>-    std::unique_ptr&lt;Vector&lt;RuleData&gt;&gt;&amp; rules = map.add(key, nullptr).iterator-&gt;value;
</del><ins>+    auto&amp; rules = map.add(key, nullptr).iterator-&gt;value;
</ins><span class="cx">     if (!rules)
</span><del>-        rules = std::make_unique&lt;Vector&lt;RuleData&gt;&gt;();
</del><ins>+        rules = std::make_unique&lt;RuleDataVector&gt;();
</ins><span class="cx">     rules-&gt;append(ruleData);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static unsigned rulesCountForName(const RuleSet::AtomRuleMap&amp; map, AtomicStringImpl* name)
</span><span class="cx"> {
</span><del>-    if (const Vector&lt;RuleData&gt;* rules = map.get(name))
</del><ins>+    if (const auto* rules = map.get(name))
</ins><span class="cx">         return rules-&gt;size();
</span><span class="cx">     return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -377,9 +377,8 @@
</span><span class="cx"> 
</span><span class="cx"> static inline void shrinkMapVectorsToFit(RuleSet::AtomRuleMap&amp; map)
</span><span class="cx"> {
</span><del>-    RuleSet::AtomRuleMap::iterator end = map.end();
-    for (RuleSet::AtomRuleMap::iterator it = map.begin(); it != end; ++it)
-        it-&gt;value-&gt;shrinkToFit();
</del><ins>+    for (auto&amp; vector : map.values())
+        vector-&gt;shrinkToFit();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RuleSet::shrinkToFit()
</span><span class="lines">@@ -395,6 +394,8 @@
</span><span class="cx">     m_focusPseudoClassRules.shrinkToFit();
</span><span class="cx">     m_universalRules.shrinkToFit();
</span><span class="cx">     m_pageRules.shrinkToFit();
</span><ins>+    m_features.shrinkToFit();
+    m_regionSelectorsAndRuleSets.shrinkToFit();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssRuleSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RuleSet.h (178579 => 178580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RuleSet.h        2015-01-16 17:13:03 UTC (rev 178579)
+++ trunk/Source/WebCore/css/RuleSet.h        2015-01-16 17:50:14 UTC (rev 178580)
</span><span class="lines">@@ -155,7 +155,8 @@
</span><span class="cx"> 
</span><span class="cx">     RuleSet();
</span><span class="cx"> 
</span><del>-    typedef HashMap&lt;AtomicStringImpl*, std::unique_ptr&lt;Vector&lt;RuleData&gt;&gt;&gt; AtomRuleMap;
</del><ins>+    typedef Vector&lt;RuleData, 1&gt; RuleDataVector;
+    typedef HashMap&lt;AtomicStringImpl*, std::unique_ptr&lt;RuleDataVector&gt;&gt; AtomRuleMap;
</ins><span class="cx"> 
</span><span class="cx">     void addRulesFromSheet(StyleSheetContents*, const MediaQueryEvaluator&amp;, StyleResolver* = 0);
</span><span class="cx"> 
</span><span class="lines">@@ -169,16 +170,17 @@
</span><span class="cx"> 
</span><span class="cx">     const RuleFeatureSet&amp; features() const { return m_features; }
</span><span class="cx"> 
</span><del>-    const Vector&lt;RuleData&gt;* idRules(AtomicStringImpl* key) const { return m_idRules.get(key); }
-    const Vector&lt;RuleData&gt;* classRules(AtomicStringImpl* key) const { return m_classRules.get(key); }
-    const Vector&lt;RuleData&gt;* tagRules(AtomicStringImpl* key) const { return m_tagRules.get(key); }
-    const Vector&lt;RuleData&gt;* shadowPseudoElementRules(AtomicStringImpl* key) const { return m_shadowPseudoElementRules.get(key); }
-    const Vector&lt;RuleData&gt;* linkPseudoClassRules() const { return &amp;m_linkPseudoClassRules; }
</del><ins>+    const RuleDataVector* idRules(AtomicStringImpl* key) const { return m_idRules.get(key); }
+    const RuleDataVector* classRules(AtomicStringImpl* key) const { return m_classRules.get(key); }
+    const RuleDataVector* tagRules(AtomicStringImpl* key) const { return m_tagRules.get(key); }
+    const RuleDataVector* shadowPseudoElementRules(AtomicStringImpl* key) const { return m_shadowPseudoElementRules.get(key); }
+    const RuleDataVector* linkPseudoClassRules() const { return &amp;m_linkPseudoClassRules; }
</ins><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>-    const Vector&lt;RuleData&gt;* cuePseudoRules() const { return &amp;m_cuePseudoRules; }
</del><ins>+    const RuleDataVector* cuePseudoRules() const { return &amp;m_cuePseudoRules; }
</ins><span class="cx"> #endif
</span><del>-    const Vector&lt;RuleData&gt;* focusPseudoClassRules() const { return &amp;m_focusPseudoClassRules; }
-    const Vector&lt;RuleData&gt;* universalRules() const { return &amp;m_universalRules; }
</del><ins>+    const RuleDataVector* focusPseudoClassRules() const { return &amp;m_focusPseudoClassRules; }
+    const RuleDataVector* universalRules() const { return &amp;m_universalRules; }
+
</ins><span class="cx">     const Vector&lt;StyleRulePage*&gt;&amp; pageRules() const { return m_pageRules; }
</span><span class="cx">     const Vector&lt;RuleSetSelectorPair&gt;&amp; regionSelectorsAndRuleSets() const { return m_regionSelectorsAndRuleSets; }
</span><span class="cx"> 
</span><span class="lines">@@ -193,12 +195,12 @@
</span><span class="cx">     AtomRuleMap m_classRules;
</span><span class="cx">     AtomRuleMap m_tagRules;
</span><span class="cx">     AtomRuleMap m_shadowPseudoElementRules;
</span><del>-    Vector&lt;RuleData&gt; m_linkPseudoClassRules;
</del><ins>+    RuleDataVector m_linkPseudoClassRules;
</ins><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>-    Vector&lt;RuleData&gt; m_cuePseudoRules;
</del><ins>+    RuleDataVector m_cuePseudoRules;
</ins><span class="cx"> #endif
</span><del>-    Vector&lt;RuleData&gt; m_focusPseudoClassRules;
-    Vector&lt;RuleData&gt; m_universalRules;
</del><ins>+    RuleDataVector m_focusPseudoClassRules;
+    RuleDataVector m_universalRules;
</ins><span class="cx">     Vector&lt;StyleRulePage*&gt; m_pageRules;
</span><span class="cx">     unsigned m_ruleCount;
</span><span class="cx">     bool m_autoShrinkToFitEnabled;
</span></span></pre>
</div>
</div>

</body>
</html>