<!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>[165186] releases/WebKitGTK/webkit-2.4/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/165186">165186</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-06 06:00:03 -0800 (Thu, 06 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/164995">r164995</a> - Optimize StylePropertiesSet::findPropertyIndex() to improve CSS properties performance
https://bugs.webkit.org/show_bug.cgi?id=129605
Patch by Lorenzo Tilve <ltilve@igalia.com> on 2014-03-03
Reviewed by Andreas Kling.
Merged from Blink (patch by Mikhail Pozdnyakov):
https://src.chromium.org/viewvc/blink?view=revision&revision=167325
Avoid checking whether 'StylePropertiesSet' is mutable and accesing directly to its
data members to achieve performance improvements
Before the optimization applied:
mean: 3064.8337171934063 runs/s
median: 3097.5899379343855 runs/s
stdev: 66.89274074044187 runs/s
min: 2891.7479324362585 runs/s
max: 3113.288683440125 runs/s
After the optimization applied:
mean: 3343.8356114138105 runs/s
median: 3356.25682957446 runs/s
stdev: 36.297533087489036 runs/s
min: 3238.5468032264243 runs/s
max: 3368.664837531425 runs/s
Performance gain for the average value is approx. 9.1%, in the
range of the 10% - 8.2% for the min and max measured
values (Linux desktop x64).
* css/StyleProperties.cpp:
(WebCore::ImmutableStyleProperties::findPropertyIndex):
(WebCore::MutableStyleProperties::findPropertyIndex):
* css/StyleProperties.h:
(WebCore::toMutableStyleProperties):
(WebCore::toImmutableStyleProperties):
(WebCore::StyleProperties::findPropertyIndex):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCorecssStylePropertiescpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/css/StyleProperties.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCorecssStylePropertiesh">releases/WebKitGTK/webkit-2.4/Source/WebCore/css/StyleProperties.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (165185 => 165186)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-03-06 13:28:03 UTC (rev 165185)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-03-06 14:00:03 UTC (rev 165186)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2014-03-03 Lorenzo Tilve <ltilve@igalia.com>
+
+ Optimize StylePropertiesSet::findPropertyIndex() to improve CSS properties performance
+ https://bugs.webkit.org/show_bug.cgi?id=129605
+
+ Reviewed by Andreas Kling.
+
+ Merged from Blink (patch by Mikhail Pozdnyakov):
+ https://src.chromium.org/viewvc/blink?view=revision&revision=167325
+
+ Avoid checking whether 'StylePropertiesSet' is mutable and accesing directly to its
+ data members to achieve performance improvements
+
+ Before the optimization applied:
+ mean: 3064.8337171934063 runs/s
+ median: 3097.5899379343855 runs/s
+ stdev: 66.89274074044187 runs/s
+ min: 2891.7479324362585 runs/s
+ max: 3113.288683440125 runs/s
+
+ After the optimization applied:
+ mean: 3343.8356114138105 runs/s
+ median: 3356.25682957446 runs/s
+ stdev: 36.297533087489036 runs/s
+ min: 3238.5468032264243 runs/s
+ max: 3368.664837531425 runs/s
+
+ Performance gain for the average value is approx. 9.1%, in the
+ range of the 10% - 8.2% for the min and max measured
+ values (Linux desktop x64).
+
+ * css/StyleProperties.cpp:
+ (WebCore::ImmutableStyleProperties::findPropertyIndex):
+ (WebCore::MutableStyleProperties::findPropertyIndex):
+ * css/StyleProperties.h:
+ (WebCore::toMutableStyleProperties):
+ (WebCore::toImmutableStyleProperties):
+ (WebCore::StyleProperties::findPropertyIndex):
+
</ins><span class="cx"> 2014-03-03 Tomas Popela <tpopela@redhat.com>
</span><span class="cx">
</span><span class="cx"> [GTK] webkit_dom_range_compare_boundary_points fails when 0 is passed as how parameter
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCorecssStylePropertiescpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/css/StyleProperties.cpp (165185 => 165186)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/css/StyleProperties.cpp 2014-03-06 13:28:03 UTC (rev 165185)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/css/StyleProperties.cpp 2014-03-06 14:00:03 UTC (rev 165186)
</span><span class="lines">@@ -1129,18 +1129,32 @@
</span><span class="cx"> return changed;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int StyleProperties::findPropertyIndex(CSSPropertyID propertyID) const
</del><ins>+int ImmutableStyleProperties::findPropertyIndex(CSSPropertyID propertyID) const
</ins><span class="cx"> {
</span><span class="cx"> // Convert here propertyID into an uint16_t to compare it with the metadata's m_propertyID to avoid
</span><span class="cx"> // the compiler converting it to an int multiple times in the loop.
</span><span class="cx"> uint16_t id = static_cast<uint16_t>(propertyID);
</span><del>- for (int n = propertyCount() - 1 ; n >= 0; --n) {
- if (id == propertyAt(n).propertyMetadata().m_propertyID)
</del><ins>+ for (int n = m_arraySize - 1 ; n >= 0; --n) {
+ if (metadataArray()[n].m_propertyID == id)
</ins><span class="cx"> return n;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+int MutableStyleProperties::findPropertyIndex(CSSPropertyID propertyID) const
+{
+ // Convert here propertyID into an uint16_t to compare it with the metadata's m_propertyID to avoid
+ // the compiler converting it to an int multiple times in the loop.
+ uint16_t id = static_cast<uint16_t>(propertyID);
+ for (int n = m_propertyVector.size() - 1 ; n >= 0; --n) {
+ if (m_propertyVector.at(n).metadata().m_propertyID == id)
+ return n;
+ }
+
+ return -1;
+}
+
</ins><span class="cx"> CSSProperty* MutableStyleProperties::findCSSPropertyWithID(CSSPropertyID propertyID)
</span><span class="cx"> {
</span><span class="cx"> int foundPropertyIndex = findPropertyIndex(propertyID);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCorecssStylePropertiesh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/css/StyleProperties.h (165185 => 165186)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/css/StyleProperties.h 2014-03-06 13:28:03 UTC (rev 165185)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/css/StyleProperties.h 2014-03-06 14:00:03 UTC (rev 165186)
</span><span class="lines">@@ -163,6 +163,7 @@
</span><span class="cx">
</span><span class="cx"> const CSSValue** valueArray() const;
</span><span class="cx"> const StylePropertyMetadata* metadataArray() const;
</span><ins>+ int findPropertyIndex(CSSPropertyID) const;
</ins><span class="cx">
</span><span class="cx"> void* m_storage;
</span><span class="cx">
</span><span class="lines">@@ -222,6 +223,8 @@
</span><span class="cx"> CSSStyleDeclaration* ensureCSSStyleDeclaration();
</span><span class="cx"> CSSStyleDeclaration* ensureInlineCSSStyleDeclaration(StyledElement* parentElement);
</span><span class="cx">
</span><ins>+ int findPropertyIndex(CSSPropertyID) const;
+
</ins><span class="cx"> Vector<CSSProperty, 4> m_propertyVector;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -236,6 +239,20 @@
</span><span class="cx"> friend class StyleProperties;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+TYPE_CASTS_BASE(MutableStyleProperties, StyleProperties, set, set->isMutable(), set.isMutable());
+
+inline MutableStyleProperties* toMutableStyleProperties(const RefPtr<StyleProperties>& set)
+{
+ return toMutableStyleProperties(set.get());
+}
+
+TYPE_CASTS_BASE(ImmutableStyleProperties, StyleProperties, set, !set->isMutable(), !set.isMutable());
+
+inline ImmutableStyleProperties* toImmutableStyleProperties(const RefPtr<StyleProperties>& set)
+{
+ return toImmutableStyleProperties(set.get());
+}
+
</ins><span class="cx"> inline const StylePropertyMetadata& StyleProperties::PropertyReference::propertyMetadata() const
</span><span class="cx"> {
</span><span class="cx"> if (m_propertySet.isMutable())
</span><span class="lines">@@ -273,6 +290,13 @@
</span><span class="cx"> delete static_cast<ImmutableStyleProperties*>(this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline int StyleProperties::findPropertyIndex(CSSPropertyID propertyID) const
+{
+ if (m_isMutable)
+ return toMutableStyleProperties(this)->findPropertyIndex(propertyID);
+ return toImmutableStyleProperties(this)->findPropertyIndex(propertyID);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // StyleProperties_h
</span></span></pre>
</div>
</div>
</body>
</html>