<!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>[191351] 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/191351">191351</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-10-20 11:48:26 -0700 (Tue, 20 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use tighter typing for collections / node lists' item() / namedItem() methods
https://bugs.webkit.org/show_bug.cgi?id=150347
Reviewed by Darin Adler.
Use tighter typing for collections / node lists' item() / namedItem() methods.
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::getDocumentLinks):
* dom/LiveNodeList.h:
* dom/StaticNodeList.cpp:
(WebCore::StaticElementList::item):
* dom/StaticNodeList.h:
* html/CachedHTMLCollection.h:
* html/HTMLAllCollection.idl:
* html/HTMLCollection.idl:
* html/HTMLFieldSetElement.cpp:
(WebCore::HTMLFieldSetElement::elements):
(WebCore::HTMLFieldSetElement::elementsForObjC):
* html/HTMLFieldSetElement.h:
* html/HTMLFieldSetElement.idl:
* html/HTMLFormControlsCollection.cpp:
(WebCore::HTMLFormControlsCollection::customElementAfter):
* html/HTMLFormControlsCollection.h:
* html/HTMLFormControlsCollection.idl:
* html/HTMLFormElement.cpp:
(WebCore::HTMLFormElement::item):
(WebCore::HTMLFormElement::elements):
(WebCore::HTMLFormElement::elementsForObjC):
* html/HTMLFormElement.h:
* html/HTMLFormElement.idl:
* html/HTMLOptionsCollection.cpp:
(WebCore::HTMLOptionsCollection::add):
* html/HTMLOptionsCollection.h:
* html/HTMLOptionsCollection.idl:
* html/HTMLSelectElement.cpp:
(WebCore::HTMLSelectElement::namedItem):
(WebCore::HTMLSelectElement::item):
(WebCore::HTMLSelectElement::setOption):
* html/HTMLSelectElement.idl:
* html/HTMLTableRowElement.cpp:
(WebCore::HTMLTableRowElement::deleteCell):
* html/HTMLTableSectionElement.cpp:
(WebCore::HTMLTableSectionElement::deleteRow):
* html/RadioNodeList.cpp:
(WebCore::toRadioButtonInputElement):
(WebCore::RadioNodeList::value):
(WebCore::RadioNodeList::setValue):
* html/RadioNodeList.h:
* html/RadioNodeList.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCoredomLiveNodeListh">trunk/Source/WebCore/dom/LiveNodeList.h</a></li>
<li><a href="#trunkSourceWebCoredomStaticNodeListcpp">trunk/Source/WebCore/dom/StaticNodeList.cpp</a></li>
<li><a href="#trunkSourceWebCoredomStaticNodeListh">trunk/Source/WebCore/dom/StaticNodeList.h</a></li>
<li><a href="#trunkSourceWebCorehtmlCachedHTMLCollectionh">trunk/Source/WebCore/html/CachedHTMLCollection.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAllCollectionidl">trunk/Source/WebCore/html/HTMLAllCollection.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLCollectionidl">trunk/Source/WebCore/html/HTMLCollection.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFieldSetElementcpp">trunk/Source/WebCore/html/HTMLFieldSetElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFieldSetElementh">trunk/Source/WebCore/html/HTMLFieldSetElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFieldSetElementidl">trunk/Source/WebCore/html/HTMLFieldSetElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlsCollectioncpp">trunk/Source/WebCore/html/HTMLFormControlsCollection.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlsCollectionh">trunk/Source/WebCore/html/HTMLFormControlsCollection.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlsCollectionidl">trunk/Source/WebCore/html/HTMLFormControlsCollection.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormElementcpp">trunk/Source/WebCore/html/HTMLFormElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormElementh">trunk/Source/WebCore/html/HTMLFormElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormElementidl">trunk/Source/WebCore/html/HTMLFormElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptionsCollectioncpp">trunk/Source/WebCore/html/HTMLOptionsCollection.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptionsCollectionh">trunk/Source/WebCore/html/HTMLOptionsCollection.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLOptionsCollectionidl">trunk/Source/WebCore/html/HTMLOptionsCollection.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementcpp">trunk/Source/WebCore/html/HTMLSelectElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementidl">trunk/Source/WebCore/html/HTMLSelectElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableRowElementcpp">trunk/Source/WebCore/html/HTMLTableRowElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableSectionElementcpp">trunk/Source/WebCore/html/HTMLTableSectionElement.cpp</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>
<li><a href="#trunkSourceWebCorehtmlRadioNodeListidl">trunk/Source/WebCore/html/RadioNodeList.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/ChangeLog 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -1,5 +1,58 @@
</span><span class="cx"> 2015-10-20 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Use tighter typing for collections / node lists' item() / namedItem() methods
+ https://bugs.webkit.org/show_bug.cgi?id=150347
+
+ Reviewed by Darin Adler.
+
+ Use tighter typing for collections / node lists' item() / namedItem() methods.
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::getDocumentLinks):
+ * dom/LiveNodeList.h:
+ * dom/StaticNodeList.cpp:
+ (WebCore::StaticElementList::item):
+ * dom/StaticNodeList.h:
+ * html/CachedHTMLCollection.h:
+ * html/HTMLAllCollection.idl:
+ * html/HTMLCollection.idl:
+ * html/HTMLFieldSetElement.cpp:
+ (WebCore::HTMLFieldSetElement::elements):
+ (WebCore::HTMLFieldSetElement::elementsForObjC):
+ * html/HTMLFieldSetElement.h:
+ * html/HTMLFieldSetElement.idl:
+ * html/HTMLFormControlsCollection.cpp:
+ (WebCore::HTMLFormControlsCollection::customElementAfter):
+ * html/HTMLFormControlsCollection.h:
+ * html/HTMLFormControlsCollection.idl:
+ * html/HTMLFormElement.cpp:
+ (WebCore::HTMLFormElement::item):
+ (WebCore::HTMLFormElement::elements):
+ (WebCore::HTMLFormElement::elementsForObjC):
+ * html/HTMLFormElement.h:
+ * html/HTMLFormElement.idl:
+ * html/HTMLOptionsCollection.cpp:
+ (WebCore::HTMLOptionsCollection::add):
+ * html/HTMLOptionsCollection.h:
+ * html/HTMLOptionsCollection.idl:
+ * html/HTMLSelectElement.cpp:
+ (WebCore::HTMLSelectElement::namedItem):
+ (WebCore::HTMLSelectElement::item):
+ (WebCore::HTMLSelectElement::setOption):
+ * html/HTMLSelectElement.idl:
+ * html/HTMLTableRowElement.cpp:
+ (WebCore::HTMLTableRowElement::deleteCell):
+ * html/HTMLTableSectionElement.cpp:
+ (WebCore::HTMLTableSectionElement::deleteRow):
+ * html/RadioNodeList.cpp:
+ (WebCore::toRadioButtonInputElement):
+ (WebCore::RadioNodeList::value):
+ (WebCore::RadioNodeList::setValue):
+ * html/RadioNodeList.h:
+ * html/RadioNodeList.idl:
+
+2015-10-20 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Only HTML spaces should be stripped from a <script>'s 'for' / 'event' attributes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150335
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -1780,19 +1780,18 @@
</span><span class="cx"> {
</span><span class="cx"> Document& document = m_renderer->document();
</span><span class="cx"> Ref<HTMLCollection> links = document.links();
</span><del>- for (unsigned i = 0; Node* curr = links->item(i); i++) {
- RenderObject* obj = curr->renderer();
- if (obj) {
- RefPtr<AccessibilityObject> axobj = document.axObjectCache()->getOrCreate(obj);
- ASSERT(axobj);
- if (!axobj->accessibilityIsIgnored() && axobj->isLink())
- result.append(axobj);
</del><ins>+ for (unsigned i = 0; auto* current = links->item(i); ++i) {
+ if (auto* renderer = current->renderer()) {
+ RefPtr<AccessibilityObject> axObject = document.axObjectCache()->getOrCreate(renderer);
+ ASSERT(axObject);
+ if (!axObject->accessibilityIsIgnored() && axObject->isLink())
+ result.append(axObject);
</ins><span class="cx"> } else {
</span><del>- Node* parent = curr->parentNode();
- if (is<HTMLAreaElement>(*curr) && is<HTMLMapElement>(parent)) {
</del><ins>+ auto* parent = current->parentNode();
+ if (is<HTMLAreaElement>(*current) && is<HTMLMapElement>(parent)) {
</ins><span class="cx"> auto& areaObject = downcast<AccessibilityImageMapLink>(*axObjectCache()->getOrCreate(ImageMapLinkRole));
</span><span class="cx"> HTMLMapElement& map = downcast<HTMLMapElement>(*parent);
</span><del>- areaObject.setHTMLAreaElement(downcast<HTMLAreaElement>(curr));
</del><ins>+ areaObject.setHTMLAreaElement(downcast<HTMLAreaElement>(current));
</ins><span class="cx"> areaObject.setHTMLMapElement(&map);
</span><span class="cx"> areaObject.setParent(accessibilityParentForImageMap(&map));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomLiveNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/LiveNodeList.h (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/LiveNodeList.h 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/dom/LiveNodeList.h 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> virtual ~CachedLiveNodeList();
</span><span class="cx">
</span><span class="cx"> unsigned length() const override final { return m_indexCache.nodeCount(nodeList()); }
</span><del>- Node* item(unsigned offset) const override final { return m_indexCache.nodeAt(nodeList(), offset); }
</del><ins>+ Element* item(unsigned offset) const override { return m_indexCache.nodeAt(nodeList(), offset); }
</ins><span class="cx">
</span><span class="cx"> // For CollectionIndexCache
</span><span class="cx"> ElementDescendantIterator collectionBegin() const { return CollectionTraversal<CollectionTraversalType::Descendants>::begin(nodeList(), rootNode()); }
</span></span></pre></div>
<a id="trunkSourceWebCoredomStaticNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/StaticNodeList.cpp (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/StaticNodeList.cpp 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/dom/StaticNodeList.cpp 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> return m_elements.size();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Node* StaticElementList::item(unsigned index) const
</del><ins>+Element* StaticElementList::item(unsigned index) const
</ins><span class="cx"> {
</span><span class="cx"> if (index < m_elements.size())
</span><span class="cx"> return const_cast<Element*>(m_elements[index].ptr());
</span></span></pre></div>
<a id="trunkSourceWebCoredomStaticNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/StaticNodeList.h (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/StaticNodeList.h 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/dom/StaticNodeList.h 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual unsigned length() const override;
</span><del>- virtual Node* item(unsigned index) const override;
</del><ins>+ virtual Element* item(unsigned index) const override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> StaticElementList()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlCachedHTMLCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/CachedHTMLCollection.h (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/CachedHTMLCollection.h 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/CachedHTMLCollection.h 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> virtual ~CachedHTMLCollection();
</span><span class="cx">
</span><span class="cx"> virtual unsigned length() const override final { return m_indexCache.nodeCount(collection()); }
</span><del>- virtual Element* item(unsigned offset) const override final { return m_indexCache.nodeAt(collection(), offset); }
</del><ins>+ virtual Element* item(unsigned offset) const override { return m_indexCache.nodeAt(collection(), offset); }
</ins><span class="cx"> virtual Element* namedItem(const AtomicString& name) const override;
</span><span class="cx"> virtual size_t memoryCost() const override final { return m_indexCache.memoryCost() + HTMLCollection::memoryCost(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAllCollectionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAllCollection.idl (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAllCollection.idl 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/HTMLAllCollection.idl 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> GenerateIsReachable=ImplOwnerNodeRoot,
</span><span class="cx"> ] interface HTMLAllCollection {
</span><span class="cx"> readonly attribute unsigned long length;
</span><del>- [Custom] getter Node item([Default=Undefined] optional unsigned long index);
- [Custom] getter Node namedItem(DOMString name);
</del><ins>+ [Custom] getter Element item([Default=Undefined] optional unsigned long index);
+ [Custom] getter Element namedItem(DOMString name);
</ins><span class="cx"> // FIXME: This should return an HTMLAllCollection.
</span><span class="cx"> NodeList tags(DOMString name);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCollectionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCollection.idl (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCollection.idl 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/HTMLCollection.idl 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -25,8 +25,14 @@
</span><span class="cx"> ReportExtraMemoryCost,
</span><span class="cx"> ] interface HTMLCollection {
</span><span class="cx"> readonly attribute unsigned long length;
</span><ins>+
+#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
</ins><span class="cx"> getter Node item([Default=Undefined] optional unsigned long index);
</span><span class="cx"> getter Node namedItem([Default=Undefined] optional DOMString name);
</span><ins>+#else
+ getter Element item([Default=Undefined] optional unsigned long index);
+ getter Element namedItem([Default=Undefined] optional DOMString name);
+#endif
</ins><span class="cx">
</span><span class="cx"> #if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
</span><span class="cx"> NodeList tags([Default=Undefined] optional DOMString name);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFieldSetElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFieldSetElement.cpp (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFieldSetElement.cpp 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/HTMLFieldSetElement.cpp 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -160,11 +160,16 @@
</span><span class="cx"> return const_cast<HTMLLegendElement*>(childrenOfType<HTMLLegendElement>(*this).first());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<HTMLCollection> HTMLFieldSetElement::elements()
</del><ins>+Ref<HTMLFormControlsCollection> HTMLFieldSetElement::elements()
</ins><span class="cx"> {
</span><span class="cx"> return ensureRareData().ensureNodeLists().addCachedCollection<HTMLFormControlsCollection>(*this, FormControls);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Ref<HTMLCollection> HTMLFieldSetElement::elementsForObjC()
+{
+ return elements();
+}
+
</ins><span class="cx"> void HTMLFieldSetElement::refreshElementsIfNeeded() const
</span><span class="cx"> {
</span><span class="cx"> uint64_t documentVersion = document().domTreeVersion();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFieldSetElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFieldSetElement.h (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFieldSetElement.h 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/HTMLFieldSetElement.h 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -30,15 +30,17 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class FormAssociatedElement;
</span><del>-class HTMLCollection;
</del><ins>+class HTMLFormControlsCollection;
</ins><span class="cx">
</span><span class="cx"> class HTMLFieldSetElement final : public HTMLFormControlElement {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<HTMLFieldSetElement> create(const QualifiedName&, Document&, HTMLFormElement*);
</span><span class="cx">
</span><span class="cx"> HTMLLegendElement* legend() const;
</span><del>- Ref<HTMLCollection> elements();
</del><span class="cx">
</span><ins>+ Ref<HTMLFormControlsCollection> elements();
+ Ref<HTMLCollection> elementsForObjC();
+
</ins><span class="cx"> const Vector<FormAssociatedElement*>& associatedElements() const;
</span><span class="cx"> unsigned length() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFieldSetElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFieldSetElement.idl (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFieldSetElement.idl 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/HTMLFieldSetElement.idl 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -24,7 +24,11 @@
</span><span class="cx">
</span><span class="cx"> readonly attribute DOMString type;
</span><span class="cx">
</span><del>- readonly attribute HTMLCollection elements;
</del><ins>+#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
+ [ImplementedAs=elementsForObjC] readonly attribute HTMLCollection elements;
+#else
+ readonly attribute HTMLFormControlsCollection elements;
+#endif
</ins><span class="cx">
</span><span class="cx"> readonly attribute boolean willValidate;
</span><span class="cx"> readonly attribute ValidityState validity;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlsCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlsCollection.cpp (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlsCollection.cpp 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/HTMLFormControlsCollection.cpp 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> return elements.size();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Element* HTMLFormControlsCollection::customElementAfter(Element* current) const
</del><ins>+HTMLElement* HTMLFormControlsCollection::customElementAfter(Element* current) const
</ins><span class="cx"> {
</span><span class="cx"> const Vector<FormAssociatedElement*>& elements = formControlElements();
</span><span class="cx"> unsigned start;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlsCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlsCollection.h (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlsCollection.h 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/HTMLFormControlsCollection.h 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -39,8 +39,10 @@
</span><span class="cx"> static Ref<HTMLFormControlsCollection> create(ContainerNode&, CollectionType);
</span><span class="cx"> virtual ~HTMLFormControlsCollection();
</span><span class="cx">
</span><ins>+ virtual HTMLElement* item(unsigned offset) const override;
+
</ins><span class="cx"> // For CachedHTMLCollection.
</span><del>- Element* customElementAfter(Element*) const;
</del><ins>+ HTMLElement* customElementAfter(Element*) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit HTMLFormControlsCollection(ContainerNode&);
</span><span class="lines">@@ -56,6 +58,11 @@
</span><span class="cx"> mutable unsigned m_cachedElementOffsetInArray;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+inline HTMLElement* HTMLFormControlsCollection::item(unsigned offset) const
+{
+ return downcast<HTMLElement>(CachedHTMLCollection<HTMLFormControlsCollection, CollectionTypeTraits<FormControls>::traversalType>::item(offset));
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_HTMLCOLLECTION(HTMLFormControlsCollection, FormControls)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlsCollectionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlsCollection.idl (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlsCollection.idl 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/HTMLFormControlsCollection.idl 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -21,6 +21,6 @@
</span><span class="cx"> [
</span><span class="cx"> GenerateIsReachable=ImplOwnerNodeRoot,
</span><span class="cx"> ] interface HTMLFormControlsCollection : HTMLCollection {
</span><del>- getter Node ([Default=Undefined] optional unsigned long index);
- [Custom] getter Node namedItem([Default=Undefined] optional DOMString name);
</del><ins>+ getter HTMLElement ([Default=Undefined] optional unsigned long index);
+ [Custom] getter HTMLElement namedItem([Default=Undefined] optional DOMString name);
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormElement.cpp (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormElement.cpp 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/HTMLFormElement.cpp 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> return len;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Node* HTMLFormElement::item(unsigned index)
</del><ins>+HTMLElement* HTMLFormElement::item(unsigned index)
</ins><span class="cx"> {
</span><span class="cx"> return elements()->item(index);
</span><span class="cx"> }
</span><span class="lines">@@ -634,11 +634,16 @@
</span><span class="cx"> ASSERT_UNUSED(removed, removed);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<HTMLCollection> HTMLFormElement::elements()
</del><ins>+Ref<HTMLFormControlsCollection> HTMLFormElement::elements()
</ins><span class="cx"> {
</span><span class="cx"> return ensureRareData().ensureNodeLists().addCachedCollection<HTMLFormControlsCollection>(*this, FormControls);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Ref<HTMLCollection> HTMLFormElement::elementsForObjC()
+{
+ return elements();
+}
+
</ins><span class="cx"> String HTMLFormElement::name() const
</span><span class="cx"> {
</span><span class="cx"> return getNameAttribute();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormElement.h (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormElement.h 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/HTMLFormElement.h 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> class FormAssociatedElement;
</span><span class="cx"> class FormData;
</span><span class="cx"> class HTMLFormControlElement;
</span><ins>+class HTMLFormControlsCollection;
</ins><span class="cx"> class HTMLImageElement;
</span><span class="cx"> class HTMLInputElement;
</span><span class="cx"> class TextEncoding;
</span><span class="lines">@@ -50,11 +51,12 @@
</span><span class="cx"> static Ref<HTMLFormElement> create(const QualifiedName&, Document&);
</span><span class="cx"> virtual ~HTMLFormElement();
</span><span class="cx">
</span><del>- Ref<HTMLCollection> elements();
</del><ins>+ Ref<HTMLFormControlsCollection> elements();
+ Ref<HTMLCollection> elementsForObjC();
</ins><span class="cx"> Vector<Ref<Element>> namedElements(const AtomicString&);
</span><span class="cx">
</span><span class="cx"> unsigned length() const;
</span><del>- Node* item(unsigned index);
</del><ins>+ HTMLElement* item(unsigned index);
</ins><span class="cx">
</span><span class="cx"> String enctype() const { return m_attributes.encodingType(); }
</span><span class="cx"> void setEnctype(const String&);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormElement.idl (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormElement.idl 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/HTMLFormElement.idl 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -32,7 +32,11 @@
</span><span class="cx"> [Reflect] attribute boolean noValidate;
</span><span class="cx"> [Reflect] attribute DOMString target;
</span><span class="cx">
</span><del>- readonly attribute HTMLCollection elements;
</del><ins>+#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
+ [ImplementedAs=elementsForObjC] readonly attribute HTMLCollection elements;
+#else
+ readonly attribute HTMLFormControlsCollection elements;
+#endif
</ins><span class="cx"> readonly attribute long length;
</span><span class="cx">
</span><span class="cx"> getter Element (unsigned long index);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionsCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionsCollection.cpp (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionsCollection.cpp 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/HTMLOptionsCollection.cpp 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> void HTMLOptionsCollection::add(HTMLElement* element, int beforeIndex, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- add(element, downcast<HTMLElement>(item(beforeIndex)), ec);
</del><ins>+ add(element, item(beforeIndex), ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLOptionsCollection::remove(int index)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionsCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionsCollection.h (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionsCollection.h 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/HTMLOptionsCollection.h 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -40,6 +40,9 @@
</span><span class="cx"> HTMLSelectElement& selectElement() { return downcast<HTMLSelectElement>(ownerNode()); }
</span><span class="cx"> const HTMLSelectElement& selectElement() const { return downcast<HTMLSelectElement>(ownerNode()); }
</span><span class="cx">
</span><ins>+ virtual HTMLOptionElement* item(unsigned offset) const override;
+ virtual HTMLOptionElement* namedItem(const AtomicString& name) const override;
+
</ins><span class="cx"> void add(HTMLElement*, HTMLElement* beforeElement, ExceptionCode&);
</span><span class="cx"> void add(HTMLElement*, int beforeIndex, ExceptionCode&);
</span><span class="cx"> void remove(int index);
</span><span class="lines">@@ -57,6 +60,16 @@
</span><span class="cx"> explicit HTMLOptionsCollection(HTMLSelectElement&);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+inline HTMLOptionElement* HTMLOptionsCollection::item(unsigned offset) const
+{
+ return downcast<HTMLOptionElement>(CachedHTMLCollection<HTMLOptionsCollection, CollectionTypeTraits<SelectOptions>::traversalType>::item(offset));
+}
+
+inline HTMLOptionElement* HTMLOptionsCollection::namedItem(const AtomicString& name) const
+{
+ return downcast<HTMLOptionElement>(CachedHTMLCollection<HTMLOptionsCollection, CollectionTypeTraits<SelectOptions>::traversalType>::namedItem(name));
+}
+
</ins><span class="cx"> inline bool HTMLOptionsCollection::elementMatches(Element& element) const
</span><span class="cx"> {
</span><span class="cx"> return element.hasTagName(HTMLNames::optionTag);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLOptionsCollectionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLOptionsCollection.idl (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLOptionsCollection.idl 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/HTMLOptionsCollection.idl 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -26,7 +26,11 @@
</span><span class="cx"> attribute long selectedIndex;
</span><span class="cx"> [CustomSetter, SetterRaisesException] attribute unsigned long length;
</span><span class="cx">
</span><ins>+#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
</ins><span class="cx"> getter Node namedItem([Default=Undefined] optional DOMString name);
</span><ins>+#else
+ getter HTMLOptionElement namedItem([Default=Undefined] optional DOMString name);
+#endif
</ins><span class="cx">
</span><span class="cx"> #if (!defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C) && (!defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT)
</span><span class="cx"> [RaisesException] void add(HTMLElement element, [Default=Undefined] optional HTMLElement? before);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.cpp (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.cpp 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/HTMLSelectElement.cpp 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -435,12 +435,12 @@
</span><span class="cx">
</span><span class="cx"> HTMLOptionElement* HTMLSelectElement::namedItem(const AtomicString& name)
</span><span class="cx"> {
</span><del>- return downcast<HTMLOptionElement>(options()->namedItem(name));
</del><ins>+ return options()->namedItem(name);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HTMLOptionElement* HTMLSelectElement::item(unsigned index)
</span><span class="cx"> {
</span><del>- return downcast<HTMLOptionElement>(options()->item(index));
</del><ins>+ return options()->item(index);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLSelectElement::setOption(unsigned index, HTMLOptionElement* option, ExceptionCode& ec)
</span><span class="lines">@@ -449,13 +449,13 @@
</span><span class="cx"> if (index > maxSelectItems - 1)
</span><span class="cx"> index = maxSelectItems - 1;
</span><span class="cx"> int diff = index - length();
</span><del>- RefPtr<HTMLElement> before = 0;
</del><ins>+ RefPtr<HTMLOptionElement> before;
</ins><span class="cx"> // Out of array bounds? First insert empty dummies.
</span><span class="cx"> if (diff > 0) {
</span><span class="cx"> setLength(index, ec);
</span><span class="cx"> // Replace an existing entry?
</span><span class="cx"> } else if (diff < 0) {
</span><del>- before = downcast<HTMLElement>(options()->item(index + 1));
</del><ins>+ before = item(index + 1);
</ins><span class="cx"> removeByIndex(index);
</span><span class="cx"> }
</span><span class="cx"> // Finally add the new element.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.idl (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.idl 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/HTMLSelectElement.idl 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -39,8 +39,15 @@
</span><span class="cx"> #else
</span><span class="cx"> [SetterRaisesException] attribute unsigned long length;
</span><span class="cx"> #endif
</span><ins>+
+#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
</ins><span class="cx"> getter Node item(unsigned long index);
</span><span class="cx"> Node namedItem([Default=Undefined] optional DOMString name);
</span><ins>+#else
+ getter HTMLOptionElement item(unsigned long index);
+ HTMLOptionElement namedItem([Default=Undefined] optional DOMString name);
+#endif
+
</ins><span class="cx"> [ObjCLegacyUnnamedParameters, RaisesException] void add(HTMLElement element, [Default=Undefined] optional HTMLElement? before);
</span><span class="cx"> #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
</span><span class="cx"> [RaisesException] void add(HTMLElement element, [Default=Undefined] optional long index);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableRowElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableRowElement.cpp (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableRowElement.cpp 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/HTMLTableRowElement.cpp 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -132,10 +132,9 @@
</span><span class="cx"> int numCells = children->length();
</span><span class="cx"> if (index == -1)
</span><span class="cx"> index = numCells-1;
</span><del>- if (index >= 0 && index < numCells) {
- RefPtr<Node> cell = children->item(index);
- HTMLElement::removeChild(*cell, ec);
- } else
</del><ins>+ if (index >= 0 && index < numCells)
+ HTMLElement::removeChild(*children->item(index), ec);
+ else
</ins><span class="cx"> ec = INDEX_SIZE_ERR;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableSectionElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableSectionElement.cpp (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableSectionElement.cpp 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/HTMLTableSectionElement.cpp 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -87,10 +87,9 @@
</span><span class="cx"> int numRows = children->length();
</span><span class="cx"> if (index == -1)
</span><span class="cx"> index = numRows - 1;
</span><del>- if (index >= 0 && index < numRows) {
- RefPtr<Node> row = children->item(index);
- HTMLElement::removeChild(*row, ec);
- } else
</del><ins>+ if (index >= 0 && index < numRows)
+ HTMLElement::removeChild(*children->item(index), ec);
+ else
</ins><span class="cx"> ec = INDEX_SIZE_ERR;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlRadioNodeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/RadioNodeList.cpp (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/RadioNodeList.cpp 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/RadioNodeList.cpp 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "RadioNodeList.h"
</span><span class="cx">
</span><del>-#include "Element.h"
</del><span class="cx"> #include "HTMLFormElement.h"
</span><span class="cx"> #include "HTMLInputElement.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="lines">@@ -50,12 +49,12 @@
</span><span class="cx"> ownerNode().nodeLists()->removeCacheWithAtomicName(this, m_name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline HTMLInputElement* toRadioButtonInputElement(Node& node)
</del><ins>+static inline HTMLInputElement* toRadioButtonInputElement(HTMLElement& element)
</ins><span class="cx"> {
</span><del>- if (!is<HTMLInputElement>(node))
</del><ins>+ if (!is<HTMLInputElement>(element))
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- auto& inputElement = downcast<HTMLInputElement>(node);
</del><ins>+ auto& inputElement = downcast<HTMLInputElement>(element);
</ins><span class="cx"> if (!inputElement.isRadioButton() || inputElement.value().isEmpty())
</span><span class="cx"> return nullptr;
</span><span class="cx"> return &inputElement;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlRadioNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/RadioNodeList.h (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/RadioNodeList.h 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/RadioNodeList.h 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #ifndef RadioNodeList_h
</span><span class="cx"> #define RadioNodeList_h
</span><span class="cx">
</span><ins>+#include "HTMLElement.h"
</ins><span class="cx"> #include "LiveNodeList.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="lines">@@ -40,8 +41,10 @@
</span><span class="cx"> return adoptRef(*new RadioNodeList(rootNode, name));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ~RadioNodeList();
</del><ins>+ virtual ~RadioNodeList();
</ins><span class="cx">
</span><ins>+ HTMLElement* item(unsigned offset) const override;
+
</ins><span class="cx"> String value() const;
</span><span class="cx"> void setValue(const String&);
</span><span class="cx">
</span><span class="lines">@@ -56,6 +59,11 @@
</span><span class="cx"> bool m_isRootedAtDocument;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+inline HTMLElement* RadioNodeList::item(unsigned offset) const
+{
+ return downcast<HTMLElement>(CachedLiveNodeList<RadioNodeList>::item(offset));
+}
+
</ins><span class="cx"> } // namepsace
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlRadioNodeListidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/RadioNodeList.idl (191350 => 191351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/RadioNodeList.idl 2015-10-20 18:37:38 UTC (rev 191350)
+++ trunk/Source/WebCore/html/RadioNodeList.idl 2015-10-20 18:48:26 UTC (rev 191351)
</span><span class="lines">@@ -29,5 +29,5 @@
</span><span class="cx"> ] interface RadioNodeList : NodeList {
</span><span class="cx"> attribute DOMString value;
</span><span class="cx">
</span><del>- getter Node (unsigned long index);
</del><ins>+ getter HTMLElement (unsigned long index);
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>