<!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>[160828] 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/160828">160828</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2013-12-19 04:15:44 -0800 (Thu, 19 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>CascadedProperties should use a bitset to track property presence.
<https://webkit.org/b/125991>
Avoid zeroing out a bunch of memory in the CascadedProperties ctor
by using a bitset to track whether each property is present in the
cascaded set.
Reviewed by Antti Koivisto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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 (160827 => 160828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-12-19 09:20:36 UTC (rev 160827)
+++ trunk/Source/WebCore/ChangeLog        2013-12-19 12:15:44 UTC (rev 160828)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-12-19 Andreas Kling <akling@apple.com>
+
+ CascadedProperties should use a bitset to track property presence.
+ <https://webkit.org/b/125991>
+
+ Avoid zeroing out a bunch of memory in the CascadedProperties ctor
+ by using a bitset to track whether each property is present in the
+ cascaded set.
+
+ Reviewed by Antti Koivisto.
+
</ins><span class="cx"> 2013-12-19 Seokju Kwon <seokju@webkit.org>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Fix description of parameters in Page.setGeolocationOverride
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (160827 => 160828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp        2013-12-19 09:20:36 UTC (rev 160827)
+++ trunk/Source/WebCore/css/StyleResolver.cpp        2013-12-19 12:15:44 UTC (rev 160828)
</span><span class="lines">@@ -126,6 +126,7 @@
</span><span class="cx"> #include "WebKitCSSTransformValue.h"
</span><span class="cx"> #include "WebKitFontFamilyNames.h"
</span><span class="cx"> #include "XMLNames.h"
</span><ins>+#include <bitset>
</ins><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="lines">@@ -199,10 +200,10 @@
</span><span class="cx"> void apply(StyleResolver&);
</span><span class="cx">
</span><span class="cx"> CSSPropertyID id;
</span><del>- bool isPresent;
</del><span class="cx"> CSSValue* cssValue[3];
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ bool hasProperty(CSSPropertyID id) const { return m_propertyIsPresent.test(id); }
</ins><span class="cx"> Property& property(CSSPropertyID);
</span><span class="cx"> bool addMatches(const MatchResult&, bool important, int startIndex, int endIndex, bool inheritedOnly);
</span><span class="cx">
</span><span class="lines">@@ -216,6 +217,8 @@
</span><span class="cx"> static void setPropertyInternal(Property&, CSSPropertyID, CSSValue&, unsigned linkMatchType);
</span><span class="cx">
</span><span class="cx"> Property m_properties[numCSSProperties + 1];
</span><ins>+ std::bitset<numCSSProperties + 1> m_propertyIsPresent;
+
</ins><span class="cx"> Vector<Property> m_deferredProperties;
</span><span class="cx">
</span><span class="cx"> TextDirection m_direction;
</span><span class="lines">@@ -4196,7 +4199,6 @@
</span><span class="cx"> : m_direction(direction)
</span><span class="cx"> , m_writingMode(writingMode)
</span><span class="cx"> {
</span><del>- memset(&m_properties, 0, sizeof(m_properties));
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline StyleResolver::CascadedProperties::Property& StyleResolver::CascadedProperties::property(CSSPropertyID id)
</span><span class="lines">@@ -4208,7 +4210,6 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(linkMatchType <= SelectorChecker::MatchAll);
</span><span class="cx"> property.id = id;
</span><del>- property.isPresent = true;
</del><span class="cx"> if (linkMatchType == SelectorChecker::MatchAll) {
</span><span class="cx"> property.cssValue[0] = &cssValue;
</span><span class="cx"> property.cssValue[SelectorChecker::MatchLink] = &cssValue;
</span><span class="lines">@@ -4225,6 +4226,9 @@
</span><span class="cx"> ASSERT(!shouldApplyPropertyInParseOrder(id));
</span><span class="cx">
</span><span class="cx"> auto& property = m_properties[id];
</span><ins>+ if (!m_propertyIsPresent.test(id))
+ memset(property.cssValue, 0, sizeof(property.cssValue));
+ m_propertyIsPresent.set(id);
</ins><span class="cx"> setPropertyInternal(property, id, cssValue, linkMatchType);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4328,10 +4332,11 @@
</span><span class="cx"> void StyleResolver::applyCascadedProperties(CascadedProperties& cascade, int firstProperty, int lastProperty)
</span><span class="cx"> {
</span><span class="cx"> for (int id = firstProperty; id <= lastProperty; ++id) {
</span><del>- auto& property = cascade.property(static_cast<CSSPropertyID>(id));
- if (!property.isPresent)
</del><ins>+ CSSPropertyID propertyID = static_cast<CSSPropertyID>(id);
+ if (!cascade.hasProperty(propertyID))
</ins><span class="cx"> continue;
</span><del>- ASSERT(!shouldApplyPropertyInParseOrder(property.id));
</del><ins>+ auto& property = cascade.property(propertyID);
+ ASSERT(!shouldApplyPropertyInParseOrder(propertyID));
</ins><span class="cx"> property.apply(*this);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>