<!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>[167877] 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/167877">167877</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-04-28 01:12:08 -0700 (Mon, 28 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>std::bitset<>::test() does unnecessary bounds checks on CSSPropertyID bitsets
https://bugs.webkit.org/show_bug.cgi?id=131685
Reviewed by Darin Adler.
Use std::bitset<>::operator[]() instead of std::bitset<>::test() to avoid
bounds checks which are not necessary as long as a CSSPropertyID value is used.
* css/CSSParser.cpp:
(WebCore::filterProperties):
* css/StyleProperties.cpp:
(WebCore::StyleProperties::asText):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::CascadedProperties::hasProperty):
(WebCore::StyleResolver::CascadedProperties::set):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertiescpp">trunk/Source/WebCore/css/StyleProperties.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167876 => 167877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-28 08:06:54 UTC (rev 167876)
+++ trunk/Source/WebCore/ChangeLog 2014-04-28 08:12:08 UTC (rev 167877)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-04-28 Zan Dobersek <zdobersek@igalia.com>
+
+ std::bitset<>::test() does unnecessary bounds checks on CSSPropertyID bitsets
+ https://bugs.webkit.org/show_bug.cgi?id=131685
+
+ Reviewed by Darin Adler.
+
+ Use std::bitset<>::operator[]() instead of std::bitset<>::test() to avoid
+ bounds checks which are not necessary as long as a CSSPropertyID value is used.
+
+ * css/CSSParser.cpp:
+ (WebCore::filterProperties):
+ * css/StyleProperties.cpp:
+ (WebCore::StyleProperties::asText):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::CascadedProperties::hasProperty):
+ (WebCore::StyleResolver::CascadedProperties::set):
+
</ins><span class="cx"> 2014-04-28 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] TextTrack kind and mode attributes are enums since r166180
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (167876 => 167877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-04-28 08:06:54 UTC (rev 167876)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-04-28 08:12:08 UTC (rev 167877)
</span><span class="lines">@@ -1474,7 +1474,8 @@
</span><span class="cx"> if (property.isImportant() != important)
</span><span class="cx"> continue;
</span><span class="cx"> const unsigned propertyIDIndex = property.id() - firstCSSProperty;
</span><del>- if (seenProperties.test(propertyIDIndex))
</del><ins>+ ASSERT(propertyIDIndex < seenProperties.size());
+ if (seenProperties[propertyIDIndex])
</ins><span class="cx"> continue;
</span><span class="cx"> seenProperties.set(propertyIDIndex);
</span><span class="cx"> output[--unusedEntries] = property;
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleProperties.cpp (167876 => 167877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleProperties.cpp 2014-04-28 08:06:54 UTC (rev 167876)
+++ trunk/Source/WebCore/css/StyleProperties.cpp 2014-04-28 08:12:08 UTC (rev 167877)
</span><span class="lines">@@ -826,13 +826,14 @@
</span><span class="cx"> borderFallbackShorthandProperty = CSSPropertyBorderColor;
</span><span class="cx">
</span><span class="cx"> // FIXME: Deal with cases where only some of border-(top|right|bottom|left) are specified.
</span><del>- if (!shorthandPropertyAppeared.test(CSSPropertyBorder - firstCSSProperty)) {
</del><ins>+ ASSERT(CSSPropertyBorder - firstCSSProperty < shorthandPropertyAppeared.size());
+ if (!shorthandPropertyAppeared[CSSPropertyBorder - firstCSSProperty]) {
</ins><span class="cx"> value = borderPropertyValue(ReturnNullOnUncommonValues);
</span><span class="cx"> if (value.isNull())
</span><span class="cx"> shorthandPropertyAppeared.set(CSSPropertyBorder - firstCSSProperty);
</span><span class="cx"> else
</span><span class="cx"> shorthandPropertyID = CSSPropertyBorder;
</span><del>- } else if (shorthandPropertyUsed.test(CSSPropertyBorder - firstCSSProperty))
</del><ins>+ } else if (shorthandPropertyUsed[CSSPropertyBorder - firstCSSProperty])
</ins><span class="cx"> shorthandPropertyID = CSSPropertyBorder;
</span><span class="cx"> if (!shorthandPropertyID)
</span><span class="cx"> shorthandPropertyID = borderFallbackShorthandProperty;
</span><span class="lines">@@ -927,9 +928,10 @@
</span><span class="cx">
</span><span class="cx"> unsigned shortPropertyIndex = shorthandPropertyID - firstCSSProperty;
</span><span class="cx"> if (shorthandPropertyID) {
</span><del>- if (shorthandPropertyUsed.test(shortPropertyIndex))
</del><ins>+ ASSERT(shortPropertyIndex < shorthandPropertyUsed.size());
+ if (shorthandPropertyUsed[shortPropertyIndex])
</ins><span class="cx"> continue;
</span><del>- if (!shorthandPropertyAppeared.test(shortPropertyIndex) && value.isNull())
</del><ins>+ if (!shorthandPropertyAppeared[shortPropertyIndex] && value.isNull())
</ins><span class="cx"> value = getPropertyValue(shorthandPropertyID);
</span><span class="cx"> shorthandPropertyAppeared.set(shortPropertyIndex);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (167876 => 167877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-04-28 08:06:54 UTC (rev 167876)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-04-28 08:12:08 UTC (rev 167877)
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> CSSValue* cssValue[3];
</span><span class="cx"> };
</span><span class="cx">
</span><del>- bool hasProperty(CSSPropertyID id) const { return m_propertyIsPresent.test(id); }
</del><ins>+ bool hasProperty(CSSPropertyID id) const;
</ins><span class="cx"> Property& property(CSSPropertyID);
</span><span class="cx"> bool addMatches(const MatchResult&, bool important, int startIndex, int endIndex, bool inheritedOnly = false);
</span><span class="cx">
</span><span class="lines">@@ -3665,6 +3665,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool StyleResolver::CascadedProperties::hasProperty(CSSPropertyID id) const
+{
+ ASSERT(id < m_propertyIsPresent.size());
+ return m_propertyIsPresent[id];
+}
+
</ins><span class="cx"> inline StyleResolver::CascadedProperties::Property& StyleResolver::CascadedProperties::property(CSSPropertyID id)
</span><span class="cx"> {
</span><span class="cx"> return m_properties[id];
</span><span class="lines">@@ -3690,7 +3696,8 @@
</span><span class="cx"> ASSERT(!shouldApplyPropertyInParseOrder(id));
</span><span class="cx">
</span><span class="cx"> auto& property = m_properties[id];
</span><del>- if (!m_propertyIsPresent.test(id))
</del><ins>+ ASSERT(id < m_propertyIsPresent.size());
+ if (!m_propertyIsPresent[id])
</ins><span class="cx"> memset(property.cssValue, 0, sizeof(property.cssValue));
</span><span class="cx"> m_propertyIsPresent.set(id);
</span><span class="cx"> setPropertyInternal(property, id, cssValue, linkMatchType);
</span></span></pre>
</div>
</div>
</body>
</html>