<!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>[175791] 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/175791">175791</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-11-09 09:21:51 -0800 (Sun, 09 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use is<>() / downcast<>() for HTMLCollection subclasses
https://bugs.webkit.org/show_bug.cgi?id=138541
Reviewed by Sam Weinig.
Use is<>() / downcast<>() for HTMLCollection subclasses for
safety and consistency with the rest of the code base.
No new tests, no behavior change.
* bindings/gobject/WebKitDOMPrivate.cpp:
(WebKit::wrap):
* html/HTMLAllCollection.h:
* html/HTMLCollection.cpp:
(WebCore::isMatchingHTMLElement):
(WebCore::isMatchingElement):
* html/HTMLCollection.h:
* html/HTMLFormControlsCollection.h:
* html/HTMLNameCollection.h:
* html/HTMLOptionsCollection.h:
* html/HTMLSelectElement.cpp:
(WebCore::HTMLSelectElement::options):
* html/HTMLTableRowsCollection.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMPrivatecpp">trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAllCollectionh">trunk/Source/WebCore/html/HTMLAllCollection.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCollectioncpp">trunk/Source/WebCore/html/HTMLCollection.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCollectionh">trunk/Source/WebCore/html/HTMLCollection.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlsCollectionh">trunk/Source/WebCore/html/HTMLFormControlsCollection.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLNameCollectionh">trunk/Source/WebCore/html/HTMLNameCollection.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptionsCollectionh">trunk/Source/WebCore/html/HTMLOptionsCollection.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementcpp">trunk/Source/WebCore/html/HTMLSelectElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableRowsCollectionh">trunk/Source/WebCore/html/HTMLTableRowsCollection.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175790 => 175791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-09 10:12:14 UTC (rev 175790)
+++ trunk/Source/WebCore/ChangeLog 2014-11-09 17:21:51 UTC (rev 175791)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-11-09 Chris Dumez <cdumez@apple.com>
+
+ Use is<>() / downcast<>() for HTMLCollection subclasses
+ https://bugs.webkit.org/show_bug.cgi?id=138541
+
+ Reviewed by Sam Weinig.
+
+ Use is<>() / downcast<>() for HTMLCollection subclasses for
+ safety and consistency with the rest of the code base.
+
+ No new tests, no behavior change.
+
+ * bindings/gobject/WebKitDOMPrivate.cpp:
+ (WebKit::wrap):
+ * html/HTMLAllCollection.h:
+ * html/HTMLCollection.cpp:
+ (WebCore::isMatchingHTMLElement):
+ (WebCore::isMatchingElement):
+ * html/HTMLCollection.h:
+ * html/HTMLFormControlsCollection.h:
+ * html/HTMLNameCollection.h:
+ * html/HTMLOptionsCollection.h:
+ * html/HTMLSelectElement.cpp:
+ (WebCore::HTMLSelectElement::options):
+ * html/HTMLTableRowsCollection.h:
+
</ins><span class="cx"> 2014-11-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Call faster HTMLElement::hasTagName() in HTMLCollection
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp (175790 => 175791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp 2014-11-09 10:12:14 UTC (rev 175790)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp 2014-11-09 17:21:51 UTC (rev 175791)
</span><span class="lines">@@ -149,8 +149,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(collection);
</span><span class="cx">
</span><del>- if (collection->type() == WebCore::SelectOptions)
- return WEBKIT_DOM_HTML_COLLECTION(wrapHTMLOptionsCollection(static_cast<HTMLOptionsCollection*>(collection)));
</del><ins>+ if (is<HTMLOptionsCollection>(*collection))
+ return WEBKIT_DOM_HTML_COLLECTION(wrapHTMLOptionsCollection(downcast<HTMLOptionsCollection>(collection)));
</ins><span class="cx"> return wrapHTMLCollection(collection);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAllCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAllCollection.h (175790 => 175791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAllCollection.h 2014-11-09 10:12:14 UTC (rev 175790)
+++ trunk/Source/WebCore/html/HTMLAllCollection.h 2014-11-09 17:21:51 UTC (rev 175791)
</span><span class="lines">@@ -43,4 +43,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+SPECIALIZE_TYPE_TRAITS_HTMLCOLLECTION(HTMLAllCollection, DocAll)
+
</ins><span class="cx"> #endif // HTMLAllCollection_h
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCollection.cpp (175790 => 175791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCollection.cpp 2014-11-09 10:12:14 UTC (rev 175790)
+++ trunk/Source/WebCore/html/HTMLCollection.cpp 2014-11-09 17:21:51 UTC (rev 175791)
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> case DocAnchors:
</span><span class="cx"> return element.hasTagName(aTag) && element.fastHasAttribute(nameAttr);
</span><span class="cx"> case DocumentNamedItems:
</span><del>- return static_cast<const DocumentNameCollection&>(collection).elementMatches(element);
</del><ins>+ return downcast<DocumentNameCollection>(collection).elementMatches(element);
</ins><span class="cx"> case DocAll:
</span><span class="cx"> case NodeChildren:
</span><span class="cx"> case WindowNamedItems:
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> case NodeChildren:
</span><span class="cx"> return true;
</span><span class="cx"> case WindowNamedItems:
</span><del>- return static_cast<const WindowNameCollection&>(collection).elementMatches(element);
</del><ins>+ return downcast<WindowNameCollection>(collection).elementMatches(element);
</ins><span class="cx"> default:
</span><span class="cx"> // Collection types that only deal with HTMLElements.
</span><span class="cx"> return is<HTMLElement>(element) && isMatchingHTMLElement(collection, downcast<HTMLElement>(element));
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCollection.h (175790 => 175791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCollection.h 2014-11-09 10:12:14 UTC (rev 175790)
+++ trunk/Source/WebCore/html/HTMLCollection.h 2014-11-09 17:21:51 UTC (rev 175791)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><ins>+#include <wtf/TypeCasts.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -175,6 +176,11 @@
</span><span class="cx"> const unsigned m_usesCustomForwardOnlyTraversal : 1;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-} // namespace
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-#endif
</del><ins>+#define SPECIALIZE_TYPE_TRAITS_HTMLCOLLECTION(ClassName, Type) \
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::ClassName) \
+ static bool isType(const WebCore::HTMLCollection& collection) { return collection.type() == WebCore::Type; } \
+SPECIALIZE_TYPE_TRAITS_END()
+
+#endif // HTMLCollection_h
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlsCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlsCollection.h (175790 => 175791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlsCollection.h 2014-11-09 10:12:14 UTC (rev 175790)
+++ trunk/Source/WebCore/html/HTMLFormControlsCollection.h 2014-11-09 17:21:51 UTC (rev 175791)
</span><span class="lines">@@ -57,6 +57,8 @@
</span><span class="cx"> mutable unsigned m_cachedElementOffsetInArray;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-} // namespace
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-#endif
</del><ins>+SPECIALIZE_TYPE_TRAITS_HTMLCOLLECTION(HTMLFormControlsCollection, FormControls)
+
+#endif // HTMLFormControlsCollection_h
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLNameCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLNameCollection.h (175790 => 175791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLNameCollection.h 2014-11-09 10:12:14 UTC (rev 175790)
+++ trunk/Source/WebCore/html/HTMLNameCollection.h 2014-11-09 17:21:51 UTC (rev 175791)
</span><span class="lines">@@ -85,6 +85,9 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-}
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-#endif
</del><ins>+SPECIALIZE_TYPE_TRAITS_HTMLCOLLECTION(WindowNameCollection, WindowNamedItems)
+SPECIALIZE_TYPE_TRAITS_HTMLCOLLECTION(DocumentNameCollection, DocumentNamedItems)
+
+#endif // HTMLNameCollection_h
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionsCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionsCollection.h (175790 => 175791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionsCollection.h 2014-11-09 10:12:14 UTC (rev 175790)
+++ trunk/Source/WebCore/html/HTMLOptionsCollection.h 2014-11-09 17:21:51 UTC (rev 175791)
</span><span class="lines">@@ -54,6 +54,8 @@
</span><span class="cx"> explicit HTMLOptionsCollection(HTMLSelectElement&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-} //namespace
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-#endif
</del><ins>+SPECIALIZE_TYPE_TRAITS_HTMLCOLLECTION(HTMLOptionsCollection, SelectOptions)
+
+#endif // HTMLOptionsCollection_h
</ins></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.cpp (175790 => 175791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.cpp 2014-11-09 10:12:14 UTC (rev 175790)
+++ trunk/Source/WebCore/html/HTMLSelectElement.cpp 2014-11-09 17:21:51 UTC (rev 175791)
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<HTMLOptionsCollection> HTMLSelectElement::options()
</span><span class="cx"> {
</span><del>- return static_cast<HTMLOptionsCollection*>(ensureCachedHTMLCollection(SelectOptions).get());
</del><ins>+ return downcast<HTMLOptionsCollection>(ensureCachedHTMLCollection(SelectOptions).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLSelectElement::updateListItemSelectedStates()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableRowsCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableRowsCollection.h (175790 => 175791)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableRowsCollection.h 2014-11-09 10:12:14 UTC (rev 175790)
+++ trunk/Source/WebCore/html/HTMLTableRowsCollection.h 2014-11-09 17:21:51 UTC (rev 175791)
</span><span class="lines">@@ -52,6 +52,8 @@
</span><span class="cx"> virtual Element* customElementAfter(Element*) const override;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-} // namespace
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><del>-#endif
</del><ins>+SPECIALIZE_TYPE_TRAITS_HTMLCOLLECTION(HTMLTableRowsCollection, TableRows)
+
+#endif // HTMLTableRowsCollection_h
</ins></span></pre>
</div>
</div>
</body>
</html>