<!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>[164654] 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/164654">164654</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-25 09:57:31 -0800 (Tue, 25 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tighten bitfields in live NodeLists and HTMLCollections
https://bugs.webkit.org/show_bug.cgi?id=129300
Reviewed by Geoffrey Garen.
Reduce the number of bits used for m_rootType and m_type in LiveNodeList.
Also use enum class for LiveNodeList types. We keep "Type" suffix not to
confuse old-ish compilers.
* dom/ClassNodeList.cpp:
(WebCore::ClassNodeList::ClassNodeList):
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::getElementsByTagName):
(WebCore::ContainerNode::getElementsByName):
(WebCore::ContainerNode::getElementsByClassName):
(WebCore::ContainerNode::radioNodeList):
* dom/LiveNodeList.cpp:
(WebCore::LiveNodeList::collectionFirst):
(WebCore::LiveNodeList::collectionTraverseForward):
* dom/LiveNodeList.h:
(WebCore::LiveNodeList::LiveNodeList):
* dom/NameNodeList.cpp:
(WebCore::NameNodeList::NameNodeList):
* dom/NameNodeList.h:
(WebCore::NameNodeList::create):
* dom/NodeRareData.h:
(WebCore::NodeListsNodeData::namedNodeListKey):
* dom/TagNodeList.cpp:
(WebCore::HTMLTagNodeList::HTMLTagNodeList):
* dom/TagNodeList.h:
(WebCore::TagNodeList::create):
(WebCore::HTMLTagNodeList::create):
* html/HTMLCollection.h:
* html/LabelableElement.cpp:
(WebCore::LabelableElement::labels):
* html/LabelsNodeList.cpp:
(WebCore::LabelsNodeList::LabelsNodeList):
* html/LabelsNodeList.h:
* html/RadioNodeList.cpp:
(WebCore::RadioNodeList::RadioNodeList):
* html/RadioNodeList.h:
(WebCore::RadioNodeList::create):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomClassNodeListcpp">trunk/Source/WebCore/dom/ClassNodeList.cpp</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodecpp">trunk/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#trunkSourceWebCoredomLiveNodeListcpp">trunk/Source/WebCore/dom/LiveNodeList.cpp</a></li>
<li><a href="#trunkSourceWebCoredomLiveNodeListh">trunk/Source/WebCore/dom/LiveNodeList.h</a></li>
<li><a href="#trunkSourceWebCoredomNameNodeListcpp">trunk/Source/WebCore/dom/NameNodeList.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNameNodeListh">trunk/Source/WebCore/dom/NameNodeList.h</a></li>
<li><a href="#trunkSourceWebCoredomNodeRareDatah">trunk/Source/WebCore/dom/NodeRareData.h</a></li>
<li><a href="#trunkSourceWebCoredomTagNodeListcpp">trunk/Source/WebCore/dom/TagNodeList.cpp</a></li>
<li><a href="#trunkSourceWebCoredomTagNodeListh">trunk/Source/WebCore/dom/TagNodeList.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCollectionh">trunk/Source/WebCore/html/HTMLCollection.h</a></li>
<li><a href="#trunkSourceWebCorehtmlLabelableElementcpp">trunk/Source/WebCore/html/LabelableElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlLabelsNodeListcpp">trunk/Source/WebCore/html/LabelsNodeList.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlLabelsNodeListh">trunk/Source/WebCore/html/LabelsNodeList.h</a></li>
<li><a href="#trunkSourceWebCorehtmlRadioNodeListcpp">trunk/Source/WebCore/html/RadioNodeList.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlRadioNodeListh">trunk/Source/WebCore/html/RadioNodeList.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164653 => 164654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-25 17:53:33 UTC (rev 164653)
+++ trunk/Source/WebCore/ChangeLog 2014-02-25 17:57:31 UTC (rev 164654)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2014-02-25 Ryosuke Niwa <rniwa@webkit.org>
+
+ Tighten bitfields in live NodeLists and HTMLCollections
+ https://bugs.webkit.org/show_bug.cgi?id=129300
+
+ Reviewed by Geoffrey Garen.
+
+ Reduce the number of bits used for m_rootType and m_type in LiveNodeList.
+ Also use enum class for LiveNodeList types. We keep "Type" suffix not to
+ confuse old-ish compilers.
+
+ * dom/ClassNodeList.cpp:
+ (WebCore::ClassNodeList::ClassNodeList):
+ * dom/ContainerNode.cpp:
+ (WebCore::ContainerNode::getElementsByTagName):
+ (WebCore::ContainerNode::getElementsByName):
+ (WebCore::ContainerNode::getElementsByClassName):
+ (WebCore::ContainerNode::radioNodeList):
+ * dom/LiveNodeList.cpp:
+ (WebCore::LiveNodeList::collectionFirst):
+ (WebCore::LiveNodeList::collectionTraverseForward):
+ * dom/LiveNodeList.h:
+ (WebCore::LiveNodeList::LiveNodeList):
+ * dom/NameNodeList.cpp:
+ (WebCore::NameNodeList::NameNodeList):
+ * dom/NameNodeList.h:
+ (WebCore::NameNodeList::create):
+ * dom/NodeRareData.h:
+ (WebCore::NodeListsNodeData::namedNodeListKey):
+ * dom/TagNodeList.cpp:
+ (WebCore::HTMLTagNodeList::HTMLTagNodeList):
+ * dom/TagNodeList.h:
+ (WebCore::TagNodeList::create):
+ (WebCore::HTMLTagNodeList::create):
+ * html/HTMLCollection.h:
+ * html/LabelableElement.cpp:
+ (WebCore::LabelableElement::labels):
+ * html/LabelsNodeList.cpp:
+ (WebCore::LabelsNodeList::LabelsNodeList):
+ * html/LabelsNodeList.h:
+ * html/RadioNodeList.cpp:
+ (WebCore::RadioNodeList::RadioNodeList):
+ * html/RadioNodeList.h:
+ (WebCore::RadioNodeList::create):
+
</ins><span class="cx"> 2014-02-24 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Make it possible to set the visited link provider on a per page basis
</span></span></pre></div>
<a id="trunkSourceWebCoredomClassNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ClassNodeList.cpp (164653 => 164654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ClassNodeList.cpp 2014-02-25 17:53:33 UTC (rev 164653)
+++ trunk/Source/WebCore/dom/ClassNodeList.cpp 2014-02-25 17:57:31 UTC (rev 164654)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> ClassNodeList::ClassNodeList(ContainerNode& rootNode, const String& classNames)
</span><del>- : LiveNodeList(rootNode, ClassNodeListType, InvalidateOnClassAttrChange)
</del><ins>+ : LiveNodeList(rootNode, Type::ClassNodeListType, InvalidateOnClassAttrChange)
</ins><span class="cx"> , m_classNames(classNames, document().inQuirksMode())
</span><span class="cx"> , m_originalClassNames(classNames)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (164653 => 164654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2014-02-25 17:53:33 UTC (rev 164653)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2014-02-25 17:57:31 UTC (rev 164654)
</span><span class="lines">@@ -1103,8 +1103,8 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> if (document().isHTMLDocument())
</span><del>- return ensureRareData().ensureNodeLists().addCacheWithAtomicName<HTMLTagNodeList>(*this, LiveNodeList::HTMLTagNodeListType, localName);
- return ensureRareData().ensureNodeLists().addCacheWithAtomicName<TagNodeList>(*this, LiveNodeList::TagNodeListType, localName);
</del><ins>+ return ensureRareData().ensureNodeLists().addCacheWithAtomicName<HTMLTagNodeList>(*this, LiveNodeList::Type::HTMLTagNodeListType, localName);
+ return ensureRareData().ensureNodeLists().addCacheWithAtomicName<TagNodeList>(*this, LiveNodeList::Type::TagNodeListType, localName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<NodeList> ContainerNode::getElementsByTagNameNS(const AtomicString& namespaceURI, const AtomicString& localName)
</span><span class="lines">@@ -1120,18 +1120,18 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<NodeList> ContainerNode::getElementsByName(const String& elementName)
</span><span class="cx"> {
</span><del>- return ensureRareData().ensureNodeLists().addCacheWithAtomicName<NameNodeList>(*this, LiveNodeList::NameNodeListType, elementName);
</del><ins>+ return ensureRareData().ensureNodeLists().addCacheWithAtomicName<NameNodeList>(*this, LiveNodeList::Type::NameNodeListType, elementName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<NodeList> ContainerNode::getElementsByClassName(const String& classNames)
</span><span class="cx"> {
</span><del>- return ensureRareData().ensureNodeLists().addCacheWithName<ClassNodeList>(*this, LiveNodeList::ClassNodeListType, classNames);
</del><ins>+ return ensureRareData().ensureNodeLists().addCacheWithName<ClassNodeList>(*this, LiveNodeList::Type::ClassNodeListType, classNames);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<RadioNodeList> ContainerNode::radioNodeList(const AtomicString& name)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(hasTagName(HTMLNames::formTag) || hasTagName(HTMLNames::fieldsetTag));
</span><del>- return ensureRareData().ensureNodeLists().addCacheWithAtomicName<RadioNodeList>(*this, LiveNodeList::RadioNodeListType, name);
</del><ins>+ return ensureRareData().ensureNodeLists().addCacheWithAtomicName<RadioNodeList>(*this, LiveNodeList::Type::RadioNodeListType, name);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomLiveNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/LiveNodeList.cpp (164653 => 164654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/LiveNodeList.cpp 2014-02-25 17:53:33 UTC (rev 164653)
+++ trunk/Source/WebCore/dom/LiveNodeList.cpp 2014-02-25 17:57:31 UTC (rev 164654)
</span><span class="lines">@@ -100,9 +100,9 @@
</span><span class="cx"> Element* LiveNodeList::collectionFirst() const
</span><span class="cx"> {
</span><span class="cx"> auto& root = rootNode();
</span><del>- if (type() == HTMLTagNodeListType)
</del><ins>+ if (type() == Type::HTMLTagNodeListType)
</ins><span class="cx"> return firstMatchingElement(static_cast<const HTMLTagNodeList*>(this), root);
</span><del>- if (type() == ClassNodeListType)
</del><ins>+ if (type() == Type::ClassNodeListType)
</ins><span class="cx"> return firstMatchingElement(static_cast<const ClassNodeList*>(this), root);
</span><span class="cx"> return firstMatchingElement(static_cast<const LiveNodeList*>(this), root);
</span><span class="cx"> }
</span><span class="lines">@@ -116,9 +116,9 @@
</span><span class="cx"> Element* LiveNodeList::collectionTraverseForward(Element& current, unsigned count, unsigned& traversedCount) const
</span><span class="cx"> {
</span><span class="cx"> auto& root = rootNode();
</span><del>- if (type() == HTMLTagNodeListType)
</del><ins>+ if (type() == Type::HTMLTagNodeListType)
</ins><span class="cx"> return traverseMatchingElementsForward(static_cast<const HTMLTagNodeList*>(this), current, count, traversedCount, root);
</span><del>- if (type() == ClassNodeListType)
</del><ins>+ if (type() == Type::ClassNodeListType)
</ins><span class="cx"> return traverseMatchingElementsForward(static_cast<const ClassNodeList*>(this), current, count, traversedCount, root);
</span><span class="cx"> return traverseMatchingElementsForward(static_cast<const LiveNodeList*>(this), current, count, traversedCount, root);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomLiveNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/LiveNodeList.h (164653 => 164654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/LiveNodeList.h 2014-02-25 17:53:33 UTC (rev 164653)
+++ trunk/Source/WebCore/dom/LiveNodeList.h 2014-02-25 17:57:31 UTC (rev 164654)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> class LiveNodeList : public NodeList {
</span><span class="cx"> public:
</span><del>- enum Type {
</del><ins>+ enum class Type {
</ins><span class="cx"> ClassNodeListType,
</span><span class="cx"> NameNodeListType,
</span><span class="cx"> TagNodeListType,
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> : m_ownerNode(ownerNode)
</span><span class="cx"> , m_rootType(rootType)
</span><span class="cx"> , m_invalidationType(invalidationType)
</span><del>- , m_type(type)
</del><ins>+ , m_type(static_cast<unsigned>(type))
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_rootType == static_cast<unsigned>(rootType));
</span><span class="cx"> ASSERT(m_invalidationType == static_cast<unsigned>(invalidationType));
</span><span class="lines">@@ -111,9 +111,9 @@
</span><span class="cx">
</span><span class="cx"> mutable CollectionIndexCache<LiveNodeList, Element> m_indexCache;
</span><span class="cx">
</span><del>- const unsigned m_rootType : 2;
</del><ins>+ const unsigned m_rootType : 1;
</ins><span class="cx"> const unsigned m_invalidationType : 4;
</span><del>- const unsigned m_type : 5;
</del><ins>+ const unsigned m_type : 3;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE bool shouldInvalidateTypeOnAttributeChange(NodeListInvalidationType type, const QualifiedName& attrName)
</span></span></pre></div>
<a id="trunkSourceWebCoredomNameNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NameNodeList.cpp (164653 => 164654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NameNodeList.cpp 2014-02-25 17:53:33 UTC (rev 164653)
+++ trunk/Source/WebCore/dom/NameNodeList.cpp 2014-02-25 17:57:31 UTC (rev 164654)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><span class="cx"> NameNodeList::NameNodeList(ContainerNode& rootNode, const AtomicString& name)
</span><del>- : LiveNodeList(rootNode, NameNodeListType, InvalidateOnNameAttrChange)
</del><ins>+ : LiveNodeList(rootNode, Type::NameNodeListType, InvalidateOnNameAttrChange)
</ins><span class="cx"> , m_name(name)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomNameNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NameNodeList.h (164653 => 164654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NameNodeList.h 2014-02-25 17:53:33 UTC (rev 164653)
+++ trunk/Source/WebCore/dom/NameNodeList.h 2014-02-25 17:57:31 UTC (rev 164654)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<NameNodeList> create(ContainerNode& rootNode, Type type, const AtomicString& name)
</span><span class="cx"> {
</span><del>- ASSERT_UNUSED(type, type == NameNodeListType);
</del><ins>+ ASSERT_UNUSED(type, type == Type::NameNodeListType);
</ins><span class="cx"> return adoptRef(new NameNodeList(rootNode, name));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeRareDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NodeRareData.h (164653 => 164654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NodeRareData.h 2014-02-25 17:53:33 UTC (rev 164653)
+++ trunk/Source/WebCore/dom/NodeRareData.h 2014-02-25 17:57:31 UTC (rev 164654)
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx">
</span><span class="cx"> std::pair<unsigned char, String> namedNodeListKey(LiveNodeList::Type type, const String& name)
</span><span class="cx"> {
</span><del>- return std::pair<unsigned char, String>(type, name);
</del><ins>+ return std::pair<unsigned char, String>(static_cast<unsigned char>(type), name);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool deleteThisAndUpdateNodeRareDataIfAboutToRemoveLastList(Node&);
</span></span></pre></div>
<a id="trunkSourceWebCoredomTagNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TagNodeList.cpp (164653 => 164654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TagNodeList.cpp 2014-02-25 17:53:33 UTC (rev 164653)
+++ trunk/Source/WebCore/dom/TagNodeList.cpp 2014-02-25 17:57:31 UTC (rev 164654)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HTMLTagNodeList::HTMLTagNodeList(ContainerNode& rootNode, const AtomicString& localName)
</span><del>- : TagNodeList(rootNode, HTMLTagNodeListType, starAtom, localName)
</del><ins>+ : TagNodeList(rootNode, Type::HTMLTagNodeListType, starAtom, localName)
</ins><span class="cx"> , m_loweredLocalName(localName.lower())
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomTagNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TagNodeList.h (164653 => 164654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TagNodeList.h 2014-02-25 17:53:33 UTC (rev 164653)
+++ trunk/Source/WebCore/dom/TagNodeList.h 2014-02-25 17:57:31 UTC (rev 164654)
</span><span class="lines">@@ -36,13 +36,13 @@
</span><span class="cx"> static PassRefPtr<TagNodeList> create(ContainerNode& rootNode, const AtomicString& namespaceURI, const AtomicString& localName)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(namespaceURI != starAtom);
</span><del>- return adoptRef(new TagNodeList(rootNode, TagNodeListType, namespaceURI, localName));
</del><ins>+ return adoptRef(new TagNodeList(rootNode, Type::TagNodeListType, namespaceURI, localName));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<TagNodeList> create(ContainerNode& rootNode, Type type, const AtomicString& localName)
</span><span class="cx"> {
</span><del>- ASSERT_UNUSED(type, type == TagNodeListType);
- return adoptRef(new TagNodeList(rootNode, TagNodeListType, starAtom, localName));
</del><ins>+ ASSERT_UNUSED(type, type == Type::TagNodeListType);
+ return adoptRef(new TagNodeList(rootNode, Type::TagNodeListType, starAtom, localName));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~TagNodeList();
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<HTMLTagNodeList> create(ContainerNode& rootNode, Type type, const AtomicString& localName)
</span><span class="cx"> {
</span><del>- ASSERT_UNUSED(type, type == HTMLTagNodeListType);
</del><ins>+ ASSERT_UNUSED(type, type == Type::HTMLTagNodeListType);
</ins><span class="cx"> return adoptRef(new HTMLTagNodeList(rootNode, localName));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCollection.h (164653 => 164654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCollection.h 2014-02-25 17:53:33 UTC (rev 164653)
+++ trunk/Source/WebCore/html/HTMLCollection.h 2014-02-25 17:57:31 UTC (rev 164654)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> mutable CollectionIndexCache<HTMLCollection, Element> m_indexCache;
</span><span class="cx">
</span><del>- const unsigned m_rootType : 2;
</del><ins>+ const unsigned m_rootType : 1;
</ins><span class="cx"> const unsigned m_invalidationType : 4;
</span><span class="cx"> const unsigned m_shouldOnlyIncludeDirectChildren : 1;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlLabelableElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/LabelableElement.cpp (164653 => 164654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/LabelableElement.cpp 2014-02-25 17:53:33 UTC (rev 164653)
+++ trunk/Source/WebCore/html/LabelableElement.cpp 2014-02-25 17:57:31 UTC (rev 164654)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> if (!supportLabels())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- return ensureRareData().ensureNodeLists().addCacheWithAtomicName<LabelsNodeList>(*this, LiveNodeList::LabelsNodeListType, starAtom);
</del><ins>+ return ensureRareData().ensureNodeLists().addCacheWithAtomicName<LabelsNodeList>(*this, LiveNodeList::Type::LabelsNodeListType, starAtom);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Webcore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlLabelsNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/LabelsNodeList.cpp (164653 => 164654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/LabelsNodeList.cpp 2014-02-25 17:53:33 UTC (rev 164653)
+++ trunk/Source/WebCore/html/LabelsNodeList.cpp 2014-02-25 17:57:31 UTC (rev 164654)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><span class="cx"> LabelsNodeList::LabelsNodeList(LabelableElement& forNode)
</span><del>- : LiveNodeList(forNode, LabelsNodeListType, InvalidateOnForAttrChange, NodeListIsRootedAtDocument)
</del><ins>+ : LiveNodeList(forNode, Type::LabelsNodeListType, InvalidateOnForAttrChange, NodeListIsRootedAtDocument)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlLabelsNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/LabelsNodeList.h (164653 => 164654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/LabelsNodeList.h 2014-02-25 17:53:33 UTC (rev 164653)
+++ trunk/Source/WebCore/html/LabelsNodeList.h 2014-02-25 17:57:31 UTC (rev 164654)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> public:
</span><span class="cx"> static PassRef<LabelsNodeList> create(LabelableElement& forNode, Type type, const AtomicString&)
</span><span class="cx"> {
</span><del>- ASSERT_UNUSED(type, type == LabelsNodeListType);
</del><ins>+ ASSERT_UNUSED(type, type == Type::LabelsNodeListType);
</ins><span class="cx"> return adoptRef(*new LabelsNodeList(forNode));
</span><span class="cx"> }
</span><span class="cx"> ~LabelsNodeList();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlRadioNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/RadioNodeList.cpp (164653 => 164654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/RadioNodeList.cpp 2014-02-25 17:53:33 UTC (rev 164653)
+++ trunk/Source/WebCore/html/RadioNodeList.cpp 2014-02-25 17:57:31 UTC (rev 164654)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><span class="cx"> RadioNodeList::RadioNodeList(ContainerNode& rootNode, const AtomicString& name)
</span><del>- : LiveNodeList(rootNode, RadioNodeListType, InvalidateForFormControls, isHTMLFormElement(rootNode) ? NodeListIsRootedAtDocument : NodeListIsRootedAtNode)
</del><ins>+ : LiveNodeList(rootNode, Type::RadioNodeListType, InvalidateForFormControls, isHTMLFormElement(rootNode) ? NodeListIsRootedAtDocument : NodeListIsRootedAtNode)
</ins><span class="cx"> , m_name(name)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlRadioNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/RadioNodeList.h (164653 => 164654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/RadioNodeList.h 2014-02-25 17:53:33 UTC (rev 164653)
+++ trunk/Source/WebCore/html/RadioNodeList.h 2014-02-25 17:57:31 UTC (rev 164654)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<RadioNodeList> create(ContainerNode& rootNode, Type type, const AtomicString& name)
</span><span class="cx"> {
</span><del>- ASSERT_UNUSED(type, type == RadioNodeListType);
</del><ins>+ ASSERT_UNUSED(type, type == Type::RadioNodeListType);
</ins><span class="cx"> return adoptRef(new RadioNodeList(rootNode, name));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>