<!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>[190978] releases/WebKitGTK/webkit-2.10/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/190978">190978</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-13 05:05:18 -0700 (Tue, 13 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190842">r190842</a> - 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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorecssElementRuleCollectorcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/css/ElementRuleCollector.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorecssElementRuleCollectorh">releases/WebKitGTK/webkit-2.10/Source/WebCore/css/ElementRuleCollector.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (190977 => 190978)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 12:03:20 UTC (rev 190977)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-13 12:05:18 UTC (rev 190978)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+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):
+
</ins><span class="cx"> 2015-10-09 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Check if start and end positions are still valid after updating them through VisibleSelection.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorecssElementRuleCollectorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/css/ElementRuleCollector.cpp (190977 => 190978)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/css/ElementRuleCollector.cpp 2015-10-13 12:03:20 UTC (rev 190977)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/css/ElementRuleCollector.cpp 2015-10-13 12:05:18 UTC (rev 190978)
</span><span class="lines">@@ -88,16 +88,12 @@
</span><span class="cx">
</span><span class="cx"> inline void ElementRuleCollector::addMatchedRule(const MatchedRule& matchedRule)
</span><span class="cx"> {
</span><del>- if (!m_matchedRules)
- m_matchedRules = std::make_unique<Vector<MatchedRule, 32>>();
- m_matchedRules->append(matchedRule);
</del><ins>+ m_matchedRules.append(matchedRule);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ElementRuleCollector::clearMatchedRules()
</span><span class="cx"> {
</span><del>- if (!m_matchedRules)
- return;
- m_matchedRules->clear();
</del><ins>+ m_matchedRules.clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void ElementRuleCollector::addElementStyleProperties(const StyleProperties* propertySet, bool isCacheable)
</span><span class="lines">@@ -197,20 +193,19 @@
</span><span class="cx">
</span><span class="cx"> void ElementRuleCollector::sortAndTransferMatchedRules()
</span><span class="cx"> {
</span><del>- if (!m_matchedRules || m_matchedRules->isEmpty())
</del><ins>+ if (m_matchedRules.isEmpty())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> sortMatchedRules();
</span><span class="cx">
</span><del>- Vector<MatchedRule, 32>& matchedRules = *m_matchedRules;
</del><span class="cx"> if (m_mode == SelectorChecker::Mode::CollectingRules) {
</span><del>- for (const MatchedRule& matchedRule : matchedRules)
</del><ins>+ for (const MatchedRule& matchedRule : m_matchedRules)
</ins><span class="cx"> m_matchedRuleList.append(matchedRule.ruleData->rule());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Now transfer the set of matched rules over to our list of declarations.
</span><del>- for (const MatchedRule& matchedRule : matchedRules) {
</del><ins>+ for (const MatchedRule& matchedRule : m_matchedRules) {
</ins><span class="cx"> if (m_style && matchedRule.ruleData->containsUncommonAttributeSelector())
</span><span class="cx"> m_style->setUnique();
</span><span class="cx"> m_result.addMatchedProperties(matchedRule.ruleData->rule()->properties(), matchedRule.ruleData->rule(), matchedRule.ruleData->linkMatchType(), matchedRule.ruleData->propertyWhitelistType(MatchingUARulesScope::isMatchingUARules()));
</span><span class="lines">@@ -398,8 +393,7 @@
</span><span class="cx">
</span><span class="cx"> void ElementRuleCollector::sortMatchedRules()
</span><span class="cx"> {
</span><del>- ASSERT(m_matchedRules);
- std::sort(m_matchedRules->begin(), m_matchedRules->end(), compareRules);
</del><ins>+ std::sort(m_matchedRules.begin(), m_matchedRules.end(), compareRules);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ElementRuleCollector::matchAllRules(bool matchAuthorAndUserStyles, bool includeSMILProperties)
</span><span class="lines">@@ -458,7 +452,7 @@
</span><span class="cx"> StyleResolver::RuleRange ruleRange(firstRuleIndex, lastRuleIndex);
</span><span class="cx"> collectMatchingRules(MatchRequest(ruleSet), ruleRange);
</span><span class="cx">
</span><del>- return m_matchedRules && !m_matchedRules->isEmpty();
</del><ins>+ return !m_matchedRules.isEmpty();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorecssElementRuleCollectorh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/css/ElementRuleCollector.h (190977 => 190978)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/css/ElementRuleCollector.h 2015-10-13 12:03:20 UTC (rev 190977)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/css/ElementRuleCollector.h 2015-10-13 12:05:18 UTC (rev 190978)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> StyleResolver::MatchResult& matchedResult();
</span><span class="cx"> const Vector<RefPtr<StyleRule>>& matchedRuleList() const;
</span><span class="cx">
</span><del>- bool hasMatchedRules() const { return m_matchedRules && !m_matchedRules->isEmpty(); }
</del><ins>+ bool hasMatchedRules() const { return !m_matchedRules.isEmpty(); }
</ins><span class="cx"> void clearMatchedRules();
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> SelectorChecker::Mode m_mode;
</span><span class="cx"> bool m_canUseFastReject;
</span><span class="cx">
</span><del>- std::unique_ptr<Vector<MatchedRule, 32>> m_matchedRules;
</del><ins>+ Vector<MatchedRule, 64> m_matchedRules;
</ins><span class="cx">
</span><span class="cx"> // Output.
</span><span class="cx"> Vector<RefPtr<StyleRule>> m_matchedRuleList;
</span></span></pre>
</div>
</div>
</body>
</html>