<!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>[204061] trunk/Source</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/204061">204061</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-02 19:20:40 -0700 (Tue, 02 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up some useless AtomicString atoms
https://bugs.webkit.org/show_bug.cgi?id=160471
Patch by Benjamin Poulain <bpoulain@apple.com> on 2016-08-02
Reviewed by Geoffrey Garen.
Source/WebCore:
The only uses of "commentAtom" and "textAtom" where for their
respective overload of Node::nodeName().
Those methods return a string, we should not keep them in the atomic
string table just to hold a small String alive. They were also the only
two nodes to behave that way.
The atom xlinkAtom was only used by createForeignAttributesMap(), which
is itself only invoked once. There is no need for the symbol xlinkAtom.
* dom/CDATASection.cpp:
(WebCore::CDATASection::nodeName):
* dom/Comment.cpp:
(WebCore::Comment::nodeName):
* dom/Document.cpp:
(WebCore::Document::nodeName):
* dom/Text.cpp:
(WebCore::Text::nodeName):
* html/parser/HTMLTreeBuilder.cpp:
(WebCore::createForeignAttributesMap):
Source/WTF:
* wtf/text/AtomicString.h:
* wtf/text/StringStatics.cpp:
(WTF::AtomicString::init): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextAtomicStringh">trunk/Source/WTF/wtf/text/AtomicString.h</a></li>
<li><a href="#trunkSourceWTFwtftextStringStaticscpp">trunk/Source/WTF/wtf/text/StringStatics.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomCDATASectioncpp">trunk/Source/WebCore/dom/CDATASection.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCommentcpp">trunk/Source/WebCore/dom/Comment.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomTextcpp">trunk/Source/WebCore/dom/Text.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLTreeBuildercpp">trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (204060 => 204061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-08-03 01:57:45 UTC (rev 204060)
+++ trunk/Source/WTF/ChangeLog 2016-08-03 02:20:40 UTC (rev 204061)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-08-02 Benjamin Poulain <bpoulain@apple.com>
+
+ Clean up some useless AtomicString atoms
+ https://bugs.webkit.org/show_bug.cgi?id=160471
+
+ Reviewed by Geoffrey Garen.
+
+ * wtf/text/AtomicString.h:
+ * wtf/text/StringStatics.cpp:
+ (WTF::AtomicString::init): Deleted.
+
</ins><span class="cx"> 2016-08-01 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC][ARM64] Fix branchTest32/64 taking an immediate as mask
</span></span></pre></div>
<a id="trunkSourceWTFwtftextAtomicStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/AtomicString.h (204060 => 204061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/AtomicString.h 2016-08-03 01:57:45 UTC (rev 204060)
+++ trunk/Source/WTF/wtf/text/AtomicString.h 2016-08-03 02:20:40 UTC (rev 204061)
</span><span class="lines">@@ -306,12 +306,9 @@
</span><span class="cx"> #ifndef ATOMICSTRING_HIDE_GLOBALS
</span><span class="cx"> extern const WTF_EXPORTDATA AtomicString nullAtom;
</span><span class="cx"> extern const WTF_EXPORTDATA AtomicString emptyAtom;
</span><del>-extern const WTF_EXPORTDATA AtomicString textAtom;
-extern const WTF_EXPORTDATA AtomicString commentAtom;
</del><span class="cx"> extern const WTF_EXPORTDATA AtomicString starAtom;
</span><span class="cx"> extern const WTF_EXPORTDATA AtomicString xmlAtom;
</span><span class="cx"> extern const WTF_EXPORTDATA AtomicString xmlnsAtom;
</span><del>-extern const WTF_EXPORTDATA AtomicString xlinkAtom;
</del><span class="cx">
</span><span class="cx"> inline AtomicString AtomicString::fromUTF8(const char* characters, size_t length)
</span><span class="cx"> {
</span><span class="lines">@@ -369,12 +366,9 @@
</span><span class="cx"> using WTF::AtomicString;
</span><span class="cx"> using WTF::nullAtom;
</span><span class="cx"> using WTF::emptyAtom;
</span><del>-using WTF::textAtom;
-using WTF::commentAtom;
</del><span class="cx"> using WTF::starAtom;
</span><span class="cx"> using WTF::xmlAtom;
</span><span class="cx"> using WTF::xmlnsAtom;
</span><del>-using WTF::xlinkAtom;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #include <wtf/text/StringConcatenate.h>
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringStaticscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringStatics.cpp (204060 => 204061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringStatics.cpp 2016-08-03 01:57:45 UTC (rev 204060)
+++ trunk/Source/WTF/wtf/text/StringStatics.cpp 2016-08-03 02:20:40 UTC (rev 204061)
</span><span class="lines">@@ -69,12 +69,9 @@
</span><span class="cx">
</span><span class="cx"> WTF_EXPORTDATA DEFINE_GLOBAL(AtomicString, nullAtom)
</span><span class="cx"> WTF_EXPORTDATA DEFINE_GLOBAL(AtomicString, emptyAtom)
</span><del>-WTF_EXPORTDATA DEFINE_GLOBAL(AtomicString, textAtom)
-WTF_EXPORTDATA DEFINE_GLOBAL(AtomicString, commentAtom)
</del><span class="cx"> WTF_EXPORTDATA DEFINE_GLOBAL(AtomicString, starAtom)
</span><span class="cx"> WTF_EXPORTDATA DEFINE_GLOBAL(AtomicString, xmlAtom)
</span><span class="cx"> WTF_EXPORTDATA DEFINE_GLOBAL(AtomicString, xmlnsAtom)
</span><del>-WTF_EXPORTDATA DEFINE_GLOBAL(AtomicString, xlinkAtom)
</del><span class="cx">
</span><span class="cx"> NEVER_INLINE unsigned StringImpl::hashSlowCase() const
</span><span class="cx"> {
</span><span class="lines">@@ -95,12 +92,9 @@
</span><span class="cx"> // Use placement new to initialize the globals.
</span><span class="cx"> new (NotNull, (void*)&nullAtom) AtomicString;
</span><span class="cx"> new (NotNull, (void*)&emptyAtom) AtomicString("");
</span><del>- new (NotNull, (void*)&textAtom) AtomicString("#text", AtomicString::ConstructFromLiteral);
- new (NotNull, (void*)&commentAtom) AtomicString("#comment", AtomicString::ConstructFromLiteral);
</del><span class="cx"> new (NotNull, (void*)&starAtom) AtomicString("*", AtomicString::ConstructFromLiteral);
</span><span class="cx"> new (NotNull, (void*)&xmlAtom) AtomicString("xml", AtomicString::ConstructFromLiteral);
</span><span class="cx"> new (NotNull, (void*)&xmlnsAtom) AtomicString("xmlns", AtomicString::ConstructFromLiteral);
</span><del>- new (NotNull, (void*)&xlinkAtom) AtomicString("xlink", AtomicString::ConstructFromLiteral);
</del><span class="cx">
</span><span class="cx"> initialized = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204060 => 204061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-03 01:57:45 UTC (rev 204060)
+++ trunk/Source/WebCore/ChangeLog 2016-08-03 02:20:40 UTC (rev 204061)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-08-02 Benjamin Poulain <bpoulain@apple.com>
+
+ Clean up some useless AtomicString atoms
+ https://bugs.webkit.org/show_bug.cgi?id=160471
+
+ Reviewed by Geoffrey Garen.
+
+ The only uses of "commentAtom" and "textAtom" where for their
+ respective overload of Node::nodeName().
+ Those methods return a string, we should not keep them in the atomic
+ string table just to hold a small String alive. They were also the only
+ two nodes to behave that way.
+
+ The atom xlinkAtom was only used by createForeignAttributesMap(), which
+ is itself only invoked once. There is no need for the symbol xlinkAtom.
+
+ * dom/CDATASection.cpp:
+ (WebCore::CDATASection::nodeName):
+ * dom/Comment.cpp:
+ (WebCore::Comment::nodeName):
+ * dom/Document.cpp:
+ (WebCore::Document::nodeName):
+ * dom/Text.cpp:
+ (WebCore::Text::nodeName):
+ * html/parser/HTMLTreeBuilder.cpp:
+ (WebCore::createForeignAttributesMap):
+
</ins><span class="cx"> 2016-08-02 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Freeze the Objective-C DOM Event and CSS bindings
</span></span></pre></div>
<a id="trunkSourceWebCoredomCDATASectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CDATASection.cpp (204060 => 204061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CDATASection.cpp 2016-08-03 01:57:45 UTC (rev 204060)
+++ trunk/Source/WebCore/dom/CDATASection.cpp 2016-08-03 02:20:40 UTC (rev 204061)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> String CDATASection::nodeName() const
</span><span class="cx"> {
</span><del>- return "#cdata-section";
</del><ins>+ return ASCIILiteral("#cdata-section");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node::NodeType CDATASection::nodeType() const
</span></span></pre></div>
<a id="trunkSourceWebCoredomCommentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Comment.cpp (204060 => 204061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Comment.cpp 2016-08-03 01:57:45 UTC (rev 204060)
+++ trunk/Source/WebCore/dom/Comment.cpp 2016-08-03 02:20:40 UTC (rev 204061)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> String Comment::nodeName() const
</span><span class="cx"> {
</span><del>- return commentAtom.string();
</del><ins>+ return ASCIILiteral("#comment");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node::NodeType Comment::nodeType() const
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (204060 => 204061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-08-03 01:57:45 UTC (rev 204060)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-08-03 02:20:40 UTC (rev 204061)
</span><span class="lines">@@ -1749,7 +1749,7 @@
</span><span class="cx">
</span><span class="cx"> String Document::nodeName() const
</span><span class="cx"> {
</span><del>- return "#document";
</del><ins>+ return ASCIILiteral("#document");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node::NodeType Document::nodeType() const
</span></span></pre></div>
<a id="trunkSourceWebCoredomTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Text.cpp (204060 => 204061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Text.cpp 2016-08-03 01:57:45 UTC (rev 204060)
+++ trunk/Source/WebCore/dom/Text.cpp 2016-08-03 02:20:40 UTC (rev 204061)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx">
</span><span class="cx"> String Text::nodeName() const
</span><span class="cx"> {
</span><del>- return textAtom.string();
</del><ins>+ return ASCIILiteral("#text");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node::NodeType Text::nodeType() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLTreeBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (204060 => 204061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2016-08-03 01:57:45 UTC (rev 204060)
+++ trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2016-08-03 02:20:40 UTC (rev 204061)
</span><span class="lines">@@ -575,11 +575,12 @@
</span><span class="cx"> {
</span><span class="cx"> HashMap<AtomicString, QualifiedName> map;
</span><span class="cx">
</span><del>- addNamesWithPrefix(map, xlinkAtom, XLinkNames::getXLinkAttrs(), XLinkNames::XLinkAttrsCount);
</del><ins>+ AtomicString xlinkName("xlink", AtomicString::ConstructFromLiteral);
+ addNamesWithPrefix(map, xlinkName, XLinkNames::getXLinkAttrs(), XLinkNames::XLinkAttrsCount);
</ins><span class="cx"> addNamesWithPrefix(map, xmlAtom, XMLNames::getXMLAttrs(), XMLNames::XMLAttrsCount);
</span><span class="cx">
</span><span class="cx"> map.add(WTF::xmlnsAtom, XMLNSNames::xmlnsAttr);
</span><del>- map.add("xmlns:xlink", QualifiedName(xmlnsAtom, xlinkAtom, XMLNSNames::xmlnsNamespaceURI));
</del><ins>+ map.add("xmlns:xlink", QualifiedName(xmlnsAtom, xlinkName, XMLNSNames::xmlnsNamespaceURI));
</ins><span class="cx">
</span><span class="cx"> return map;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>