<!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>[170828] 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/170828">170828</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-07-06 11:01:06 -0700 (Sun, 06 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Inline Node's rare data getters.
<https://webkit.org/b/134652>
There was a fair bit of overhead when calling Node::ensureRareData()
from Document's collection getters. This patch inlines the case where
we've already materialized the rare data.
Reviewed by Antti Koivisto.
* dom/Node.cpp:
(WebCore::Node::materializeRareData):
(WebCore::Node::rareData): Deleted.
(WebCore::Node::ensureRareData): Deleted.
* dom/Node.h:
* dom/NodeRareData.h:
(WebCore::Node::rareData):
(WebCore::Node::ensureRareData):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodeh">trunk/Source/WebCore/dom/Node.h</a></li>
<li><a href="#trunkSourceWebCoredomNodeRareDatah">trunk/Source/WebCore/dom/NodeRareData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170827 => 170828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-07-06 00:03:15 UTC (rev 170827)
+++ trunk/Source/WebCore/ChangeLog        2014-07-06 18:01:06 UTC (rev 170828)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-07-06 Andreas Kling <akling@apple.com>
+
+ Inline Node's rare data getters.
+ <https://webkit.org/b/134652>
+
+ There was a fair bit of overhead when calling Node::ensureRareData()
+ from Document's collection getters. This patch inlines the case where
+ we've already materialized the rare data.
+
+ Reviewed by Antti Koivisto.
+
+ * dom/Node.cpp:
+ (WebCore::Node::materializeRareData):
+ (WebCore::Node::rareData): Deleted.
+ (WebCore::Node::ensureRareData): Deleted.
+ * dom/Node.h:
+ * dom/NodeRareData.h:
+ (WebCore::Node::rareData):
+ (WebCore::Node::ensureRareData):
+
</ins><span class="cx"> 2014-07-05 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] MediaDocument should set a viewport
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (170827 => 170828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp        2014-07-06 00:03:15 UTC (rev 170827)
+++ trunk/Source/WebCore/dom/Node.cpp        2014-07-06 18:01:06 UTC (rev 170828)
</span><span class="lines">@@ -325,17 +325,8 @@
</span><span class="cx"> cache->remove(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-NodeRareData* Node::rareData() const
</del><ins>+void Node::materializeRareData()
</ins><span class="cx"> {
</span><del>- ASSERT_WITH_SECURITY_IMPLICATION(hasRareData());
- return static_cast<NodeRareData*>(m_data.m_rareData);
-}
-
-NodeRareData& Node::ensureRareData()
-{
- if (hasRareData())
- return *rareData();
-
</del><span class="cx"> NodeRareData* data;
</span><span class="cx"> if (isElementNode())
</span><span class="cx"> data = ElementRareData::create(toRenderElement(m_data.m_renderer)).leakPtr();
</span><span class="lines">@@ -345,7 +336,6 @@
</span><span class="cx">
</span><span class="cx"> m_data.m_rareData = data;
</span><span class="cx"> setFlag(HasRareDataFlag);
</span><del>- return *data;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Node::clearRareData()
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (170827 => 170828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h        2014-07-06 00:03:15 UTC (rev 170827)
+++ trunk/Source/WebCore/dom/Node.h        2014-07-06 18:01:06 UTC (rev 170828)
</span><span class="lines">@@ -691,6 +691,7 @@
</span><span class="cx"> Element* ancestorElement() const;
</span><span class="cx">
</span><span class="cx"> void trackForDebugging();
</span><ins>+ void materializeRareData();
</ins><span class="cx">
</span><span class="cx"> Vector<OwnPtr<MutationObserverRegistration>>* mutationObserverRegistry();
</span><span class="cx"> HashSet<MutationObserverRegistration*>* transientMutationObserverRegistry();
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeRareDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NodeRareData.h (170827 => 170828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NodeRareData.h        2014-07-06 00:03:15 UTC (rev 170827)
+++ trunk/Source/WebCore/dom/NodeRareData.h        2014-07-06 18:01:06 UTC (rev 170828)
</span><span class="lines">@@ -356,6 +356,19 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline NodeRareData* Node::rareData() const
+{
+ ASSERT_WITH_SECURITY_IMPLICATION(hasRareData());
+ return static_cast<NodeRareData*>(m_data.m_rareData);
+}
+
+inline NodeRareData& Node::ensureRareData()
+{
+ if (!hasRareData())
+ materializeRareData();
+ return *rareData();
+}
+
</ins><span class="cx"> // Ensure the 10 bits reserved for the m_connectedFrameCount cannot overflow
</span><span class="cx"> COMPILE_ASSERT(Page::maxNumberOfFrames < 1024, Frame_limit_should_fit_in_rare_data_count);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>