<!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>[188753] 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/188753">188753</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-08-21 01:28:07 -0700 (Fri, 21 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Drop NodeListBase class
https://bugs.webkit.org/show_bug.cgi?id=148290
Reviewed by Ryosuke Niwa.
Drop NodeListBase class and have HTMLCollection subclass NodeList
directly. There is no reason we need another base class.
* WebCore.xcodeproj/project.pbxproj:
* bindings/scripts/CodeGeneratorObjC.pm:
(GetImplClassName): Deleted.
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::getElementsByClassNameForObjC):
* dom/ContainerNode.h:
* dom/NodeList.h:
* dom/NodeListBase.h: Removed.
* html/HTMLCollection.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorObjCpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodecpp">trunk/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodeh">trunk/Source/WebCore/dom/ContainerNode.h</a></li>
<li><a href="#trunkSourceWebCoredomNodeListh">trunk/Source/WebCore/dom/NodeList.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCollectionh">trunk/Source/WebCore/html/HTMLCollection.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoredomNodeListBaseh">trunk/Source/WebCore/dom/NodeListBase.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188752 => 188753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-21 04:59:59 UTC (rev 188752)
+++ trunk/Source/WebCore/ChangeLog 2015-08-21 08:28:07 UTC (rev 188753)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-08-21 Chris Dumez <cdumez@apple.com>
+
+ Drop NodeListBase class
+ https://bugs.webkit.org/show_bug.cgi?id=148290
+
+ Reviewed by Ryosuke Niwa.
+
+ Drop NodeListBase class and have HTMLCollection subclass NodeList
+ directly. There is no reason we need another base class.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/scripts/CodeGeneratorObjC.pm:
+ (GetImplClassName): Deleted.
+ * dom/ContainerNode.cpp:
+ (WebCore::ContainerNode::getElementsByClassNameForObjC):
+ * dom/ContainerNode.h:
+ * dom/NodeList.h:
+ * dom/NodeListBase.h: Removed.
+ * html/HTMLCollection.h:
+
</ins><span class="cx"> 2015-08-20 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] prototyping module loader in JSC shell
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (188752 => 188753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-21 04:59:59 UTC (rev 188752)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-21 08:28:07 UTC (rev 188753)
</span><span class="lines">@@ -2690,7 +2690,6 @@
</span><span class="cx"> 8386A97019F61E4F00E1EC4A /* StyleBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8386A96E19F61E4F00E1EC4A /* StyleBuilder.cpp */; };
</span><span class="cx"> 839AAFEC1A0C0C8D00605F99 /* HTMLWBRElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 839AAFEA1A0C0C8D00605F99 /* HTMLWBRElement.cpp */; };
</span><span class="cx"> 839AAFED1A0C0C8D00605F99 /* HTMLWBRElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 839AAFEB1A0C0C8D00605F99 /* HTMLWBRElement.h */; };
</span><del>- 83AAE64A1B85816B009FAF70 /* NodeListBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 83AAE6491B858168009FAF70 /* NodeListBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 83B9687B19F8AB83004EF7AF /* StyleBuilderConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = 83B9687919F8AB83004EF7AF /* StyleBuilderConverter.h */; };
</span><span class="cx"> 83C05A5A1A686212007E5DEA /* StylePropertyShorthandFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83C05A581A686212007E5DEA /* StylePropertyShorthandFunctions.cpp */; };
</span><span class="cx"> 83C05A5B1A686212007E5DEA /* StylePropertyShorthandFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = 83C05A591A686212007E5DEA /* StylePropertyShorthandFunctions.h */; };
</span><span class="lines">@@ -10055,7 +10054,6 @@
</span><span class="cx"> 8386A96E19F61E4F00E1EC4A /* StyleBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleBuilder.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 839AAFEA1A0C0C8D00605F99 /* HTMLWBRElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLWBRElement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 839AAFEB1A0C0C8D00605F99 /* HTMLWBRElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLWBRElement.h; sourceTree = "<group>"; };
</span><del>- 83AAE6491B858168009FAF70 /* NodeListBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeListBase.h; sourceTree = "<group>"; };
</del><span class="cx"> 83B9687919F8AB83004EF7AF /* StyleBuilderConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleBuilderConverter.h; sourceTree = "<group>"; };
</span><span class="cx"> 83C05A581A686212007E5DEA /* StylePropertyShorthandFunctions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StylePropertyShorthandFunctions.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 83C05A591A686212007E5DEA /* StylePropertyShorthandFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StylePropertyShorthandFunctions.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -23404,7 +23402,6 @@
</span><span class="cx"> 1A750D870A90E394000FF215 /* NodeIterator.idl */,
</span><span class="cx"> A81872100977D3C0005826D9 /* NodeList.h */,
</span><span class="cx"> 85ACA9FA0A9B631000671E90 /* NodeList.idl */,
</span><del>- 83AAE6491B858168009FAF70 /* NodeListBase.h */,
</del><span class="cx"> 7CEAC1081B483D7F00334482 /* NodeOrString.cpp */,
</span><span class="cx"> 7CEAC1061B483D1D00334482 /* NodeOrString.h */,
</span><span class="cx"> 4FAB48661643A67E00F70C07 /* NodeRareData.cpp */,
</span><span class="lines">@@ -26236,7 +26233,6 @@
</span><span class="cx"> 1477E7770BF4134A00152872 /* PageCache.h in Headers */,
</span><span class="cx"> CD5E5B5F1A15CE54000C609E /* PageConfiguration.h in Headers */,
</span><span class="cx"> F3820893147D35F90010BC06 /* PageConsoleAgent.h in Headers */,
</span><del>- 83AAE64A1B85816B009FAF70 /* NodeListBase.h in Headers */,
</del><span class="cx"> DAED203116F244480070EC0F /* PageConsoleClient.h in Headers */,
</span><span class="cx"> A5A2AF0C1829734300DE1729 /* PageDebuggable.h in Headers */,
</span><span class="cx"> F34742DD134362F000531BC2 /* PageDebuggerAgent.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorObjCpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm (188752 => 188753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2015-08-21 04:59:59 UTC (rev 188752)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2015-08-21 08:28:07 UTC (rev 188753)
</span><span class="lines">@@ -420,7 +420,6 @@
</span><span class="cx"> {
</span><span class="cx"> my $name = shift;
</span><span class="cx">
</span><del>- return "NodeListBase" if $name eq "NodeList";
</del><span class="cx"> return "DOMWindow" if $name eq "AbstractView";
</span><span class="cx"> return $name;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (188752 => 188753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2015-08-21 04:59:59 UTC (rev 188752)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2015-08-21 08:28:07 UTC (rev 188753)
</span><span class="lines">@@ -895,7 +895,7 @@
</span><span class="cx"> return ensureRareData().ensureNodeLists().addCachedCollection<ClassCollection>(*this, ByClass, classNames);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<NodeListBase> ContainerNode::getElementsByClassNameForObjC(const AtomicString& classNames)
</del><ins>+RefPtr<NodeList> ContainerNode::getElementsByClassNameForObjC(const AtomicString& classNames)
</ins><span class="cx"> {
</span><span class="cx"> return getElementsByClassName(classNames);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.h (188752 => 188753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.h 2015-08-21 04:59:59 UTC (rev 188752)
+++ trunk/Source/WebCore/dom/ContainerNode.h 2015-08-21 08:28:07 UTC (rev 188753)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class HTMLCollection;
</span><del>-class NodeListBase;
</del><ins>+class NodeList;
</ins><span class="cx"> class NodeOrString;
</span><span class="cx"> class QualifiedName;
</span><span class="cx"> class RenderElement;
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> RefPtr<NodeList> getElementsByTagNameNS(const AtomicString& namespaceURI, const AtomicString& localName);
</span><span class="cx"> RefPtr<NodeList> getElementsByName(const String& elementName);
</span><span class="cx"> RefPtr<HTMLCollection> getElementsByClassName(const AtomicString& classNames);
</span><del>- RefPtr<NodeListBase> getElementsByClassNameForObjC(const AtomicString& classNames);
</del><ins>+ RefPtr<NodeList> getElementsByClassNameForObjC(const AtomicString& classNames);
</ins><span class="cx"> RefPtr<RadioNodeList> radioNodeList(const AtomicString&);
</span><span class="cx">
</span><span class="cx"> // From the ParentNode interface - https://dom.spec.whatwg.org/#interface-parentnode
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NodeList.h (188752 => 188753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NodeList.h 2015-08-21 04:59:59 UTC (rev 188752)
+++ trunk/Source/WebCore/dom/NodeList.h 2015-08-21 08:28:07 UTC (rev 188753)
</span><span class="lines">@@ -24,19 +24,21 @@
</span><span class="cx"> #ifndef NodeList_h
</span><span class="cx"> #define NodeList_h
</span><span class="cx">
</span><del>-#include "NodeListBase.h"
</del><span class="cx"> #include "ScriptWrappable.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><ins>+#include <wtf/RefCounted.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Node;
</span><span class="cx">
</span><del>-class NodeList : public NodeListBase, public ScriptWrappable {
</del><ins>+class NodeList : public ScriptWrappable, public RefCounted<NodeList> {
</ins><span class="cx"> public:
</span><span class="cx"> virtual ~NodeList() { }
</span><span class="cx">
</span><span class="cx"> // DOM methods & attributes for NodeList
</span><ins>+ virtual unsigned length() const = 0;
+ virtual Node* item(unsigned index) const = 0;
</ins><span class="cx"> virtual Node* namedItem(const AtomicString&) const = 0;
</span><span class="cx">
</span><span class="cx"> // Other methods (not part of DOM)
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeListBaseh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/dom/NodeListBase.h (188752 => 188753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NodeListBase.h 2015-08-21 04:59:59 UTC (rev 188752)
+++ trunk/Source/WebCore/dom/NodeListBase.h 2015-08-21 08:28:07 UTC (rev 188753)
</span><span class="lines">@@ -1,47 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef NodeListBase_h
-#define NodeListBase_h
-
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class Node;
-
-// This is a common base class for NodeList / HTMLCollection to maintain legacy ObjC API compatibility.
-class NodeListBase : public RefCounted<NodeListBase> {
-public:
- virtual ~NodeListBase() { }
-
- virtual unsigned length() const = 0;
- virtual Node* item(unsigned index) const = 0;
-};
-
-} // namespace WebCore.
-
-#endif // NodeListBase_h
-
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCollection.h (188752 => 188753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCollection.h 2015-08-21 04:59:59 UTC (rev 188752)
+++ trunk/Source/WebCore/html/HTMLCollection.h 2015-08-21 08:28:07 UTC (rev 188753)
</span><span class="lines">@@ -58,18 +58,19 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class HTMLCollection : public NodeListBase, public ScriptWrappable {
</del><ins>+// HTMLCollection subclasses NodeList to maintain legacy ObjC API compatibility.
+class HTMLCollection : public NodeList {
</ins><span class="cx"> public:
</span><span class="cx"> virtual ~HTMLCollection();
</span><span class="cx">
</span><span class="cx"> // DOM API
</span><del>- virtual Element* item(unsigned index) const = 0; // Tighten return type from NodeListBase::item().
- virtual Element* namedItem(const AtomicString& name) const = 0;
</del><ins>+ virtual Element* item(unsigned index) const override = 0; // Tighten return type from NodeList::item().
+ virtual Element* namedItem(const AtomicString& name) const override = 0; // Tighten return type from NodeList::namedItem().
</ins><span class="cx"> PassRefPtr<NodeList> tags(const String&);
</span><span class="cx">
</span><span class="cx"> // Non-DOM API
</span><span class="cx"> Vector<Ref<Element>> namedItems(const AtomicString& name) const;
</span><del>- virtual size_t memoryCost() const;
</del><ins>+ virtual size_t memoryCost() const override;
</ins><span class="cx">
</span><span class="cx"> bool isRootedAtDocument() const;
</span><span class="cx"> NodeListInvalidationType invalidationType() const;
</span></span></pre>
</div>
</div>
</body>
</html>