<!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>[173783] 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/173783">173783</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-09-19 17:11:47 -0700 (Fri, 19 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Minimize virtual function calls in MarkupAccumulator
https://bugs.webkit.org/show_bug.cgi?id=136957
Reviewed by Benjamin Poulain.
This patch minimizes the number of virtual function calls in
MarkupAccumulator by:
- De-virtualizing MarkupAccumulator::appendString(), which is never
overridden
- Having MarkupAccumulator::appendEndTag() virtual function take an
Element in argument instead of a Node, as it only applies to Element.
Also add a non-virtual overload that takes a Node in argument and
that does the isElementNode() check so that we don't need to explicitly
do the check at each call site.
No new tests, no behavior change.
* editing/MarkupAccumulator.cpp:
(WebCore::MarkupAccumulator::appendEndTag):
(WebCore::MarkupAccumulator::shouldSelfClose):
(WebCore::MarkupAccumulator::appendEndMarkup):
* editing/MarkupAccumulator.h:
(WebCore::MarkupAccumulator::appendEndTag):
* page/PageSerializer.cpp:
(WebCore::SerializerMarkupAccumulator::appendEndTag):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingMarkupAccumulatorcpp">trunk/Source/WebCore/editing/MarkupAccumulator.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingMarkupAccumulatorh">trunk/Source/WebCore/editing/MarkupAccumulator.h</a></li>
<li><a href="#trunkSourceWebCorepagePageSerializercpp">trunk/Source/WebCore/page/PageSerializer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173782 => 173783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-20 00:05:13 UTC (rev 173782)
+++ trunk/Source/WebCore/ChangeLog 2014-09-20 00:11:47 UTC (rev 173783)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-09-19 Chris Dumez <cdumez@apple.com>
+
+ Minimize virtual function calls in MarkupAccumulator
+ https://bugs.webkit.org/show_bug.cgi?id=136957
+
+ Reviewed by Benjamin Poulain.
+
+ This patch minimizes the number of virtual function calls in
+ MarkupAccumulator by:
+ - De-virtualizing MarkupAccumulator::appendString(), which is never
+ overridden
+ - Having MarkupAccumulator::appendEndTag() virtual function take an
+ Element in argument instead of a Node, as it only applies to Element.
+ Also add a non-virtual overload that takes a Node in argument and
+ that does the isElementNode() check so that we don't need to explicitly
+ do the check at each call site.
+
+ No new tests, no behavior change.
+
+ * editing/MarkupAccumulator.cpp:
+ (WebCore::MarkupAccumulator::appendEndTag):
+ (WebCore::MarkupAccumulator::shouldSelfClose):
+ (WebCore::MarkupAccumulator::appendEndMarkup):
+ * editing/MarkupAccumulator.h:
+ (WebCore::MarkupAccumulator::appendEndTag):
+ * page/PageSerializer.cpp:
+ (WebCore::SerializerMarkupAccumulator::appendEndTag):
+
</ins><span class="cx"> 2014-09-19 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] ASSERTION FAILED: WTF::isMainThread() in WebCore::memoryCache() when using WebKit1
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingMarkupAccumulatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/MarkupAccumulator.cpp (173782 => 173783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/MarkupAccumulator.cpp 2014-09-20 00:05:13 UTC (rev 173782)
+++ trunk/Source/WebCore/editing/MarkupAccumulator.cpp 2014-09-20 00:11:47 UTC (rev 173783)
</span><span class="lines">@@ -201,9 +201,9 @@
</span><span class="cx"> m_nodes->append(const_cast<Node*>(&node));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MarkupAccumulator::appendEndTag(const Node& node)
</del><ins>+void MarkupAccumulator::appendEndTag(const Element& element)
</ins><span class="cx"> {
</span><del>- appendEndMarkup(m_markup, node);
</del><ins>+ appendEndMarkup(m_markup, element);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t MarkupAccumulator::totalLength(const Vector<String>& strings)
</span><span class="lines">@@ -590,13 +590,13 @@
</span><span class="cx"> // 2. Elements w/ children never self-close because they use a separate end tag.
</span><span class="cx"> // 3. HTML elements which do not have a "forbidden" end tag will close with a separate end tag.
</span><span class="cx"> // 4. Other elements self-close.
</span><del>-bool MarkupAccumulator::shouldSelfClose(const Node& node)
</del><ins>+bool MarkupAccumulator::shouldSelfClose(const Element& element)
</ins><span class="cx"> {
</span><del>- if (!inXMLFragmentSerialization() && node.document().isHTMLDocument())
</del><ins>+ if (!inXMLFragmentSerialization() && element.document().isHTMLDocument())
</ins><span class="cx"> return false;
</span><del>- if (node.hasChildNodes())
</del><ins>+ if (element.hasChildNodes())
</ins><span class="cx"> return false;
</span><del>- if (node.isHTMLElement() && !elementCannotHaveEndTag(node))
</del><ins>+ if (element.isHTMLElement() && !elementCannotHaveEndTag(element))
</ins><span class="cx"> return false;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -613,14 +613,14 @@
</span><span class="cx"> return toHTMLElement(node).ieForbidsInsertHTML();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MarkupAccumulator::appendEndMarkup(StringBuilder& result, const Node& node)
</del><ins>+void MarkupAccumulator::appendEndMarkup(StringBuilder& result, const Element& element)
</ins><span class="cx"> {
</span><del>- if (!node.isElementNode() || shouldSelfClose(node) || (!node.hasChildNodes() && elementCannotHaveEndTag(node)))
</del><ins>+ if (shouldSelfClose(element) || (!element.hasChildNodes() && elementCannotHaveEndTag(element)))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> result.append('<');
</span><span class="cx"> result.append('/');
</span><del>- result.append(toElement(node).nodeNamePreservingCase());
</del><ins>+ result.append(element.nodeNamePreservingCase());
</ins><span class="cx"> result.append('>');
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingMarkupAccumulatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/MarkupAccumulator.h (173782 => 173783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/MarkupAccumulator.h 2014-09-20 00:05:13 UTC (rev 173782)
+++ trunk/Source/WebCore/editing/MarkupAccumulator.h 2014-09-20 00:11:47 UTC (rev 173783)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef MarkupAccumulator_h
</span><span class="cx"> #define MarkupAccumulator_h
</span><span class="cx">
</span><ins>+#include "Element.h"
</ins><span class="cx"> #include "markup.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="lines">@@ -72,8 +73,14 @@
</span><span class="cx">
</span><span class="cx"> void concatenateMarkup(StringBuilder&);
</span><span class="cx">
</span><del>- virtual void appendString(const String&);
- virtual void appendEndTag(const Node&);
</del><ins>+ void appendString(const String&);
+ void appendEndTag(const Node& node)
+ {
+ if (node.isElementNode())
+ appendEndTag(toElement(node));
+ }
+
+ virtual void appendEndTag(const Element&);
</ins><span class="cx"> virtual void appendCustomAttributes(StringBuilder&, const Element&, Namespaces*);
</span><span class="cx"> virtual void appendText(StringBuilder&, const Text&);
</span><span class="cx"> virtual void appendElement(StringBuilder&, const Element&, Namespaces*);
</span><span class="lines">@@ -84,7 +91,7 @@
</span><span class="cx"> void appendCloseTag(StringBuilder&, const Element&);
</span><span class="cx">
</span><span class="cx"> void appendStartMarkup(StringBuilder&, const Node&, Namespaces*);
</span><del>- void appendEndMarkup(StringBuilder&, const Node&);
</del><ins>+ void appendEndMarkup(StringBuilder&, const Element&);
</ins><span class="cx">
</span><span class="cx"> void appendAttributeValue(StringBuilder&, const String&, bool);
</span><span class="cx"> void appendNamespace(StringBuilder&, const AtomicString& prefix, const AtomicString& namespaceURI, Namespaces&, bool allowEmptyDefaultNS = false);
</span><span class="lines">@@ -96,7 +103,7 @@
</span><span class="cx">
</span><span class="cx"> bool shouldAddNamespaceElement(const Element&);
</span><span class="cx"> bool shouldAddNamespaceAttribute(const Attribute&, Namespaces&);
</span><del>- bool shouldSelfClose(const Node&);
</del><ins>+ bool shouldSelfClose(const Element&);
</ins><span class="cx"> bool elementCannotHaveEndTag(const Node&);
</span><span class="cx"> EntityMask entityMaskForText(const Text&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageSerializercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageSerializer.cpp (173782 => 173783)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageSerializer.cpp 2014-09-20 00:05:13 UTC (rev 173782)
+++ trunk/Source/WebCore/page/PageSerializer.cpp 2014-09-20 00:11:47 UTC (rev 173783)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> virtual void appendText(StringBuilder&, const Text&) override;
</span><span class="cx"> virtual void appendElement(StringBuilder&, const Element&, Namespaces*) override;
</span><span class="cx"> virtual void appendCustomAttributes(StringBuilder&, const Element&, Namespaces*) override;
</span><del>- virtual void appendEndTag(const Node&) override;
</del><ins>+ virtual void appendEndTag(const Element&) override;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> SerializerMarkupAccumulator::SerializerMarkupAccumulator(PageSerializer& serializer, Document& document, Vector<Node*>* nodes)
</span><span class="lines">@@ -163,10 +163,10 @@
</span><span class="cx"> appendAttribute(out, element, Attribute(frameOwnerURLAttributeName(frameOwner), url.string()), namespaces);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SerializerMarkupAccumulator::appendEndTag(const Node& node)
</del><ins>+void SerializerMarkupAccumulator::appendEndTag(const Element& element)
</ins><span class="cx"> {
</span><del>- if (node.isElementNode() && !shouldIgnoreElement(toElement(node)))
- MarkupAccumulator::appendEndTag(node);
</del><ins>+ if (!shouldIgnoreElement(element))
+ MarkupAccumulator::appendEndTag(element);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PageSerializer::Resource::Resource()
</span></span></pre>
</div>
</div>
</body>
</html>