<!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>[175947] 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/175947">175947</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-11-11 09:35:29 -0800 (Tue, 11 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Minor tweaks to HTMLCollection
https://bugs.webkit.org/show_bug.cgi?id=138556
Reviewed by Chris Dumez.
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::addRadioButtonGroupMembers):
Update for namedElements function that now returns a Vector; also use
a new style for loop to iterate it.
* bindings/js/JSHTMLAllCollectionCustom.cpp: Removed some unneeded includes.
(WebCore::namedItems): Updated name to match WebKit coding style, and also
updated to use the return value from namedItems, which now returns a Vector.
(WebCore::callHTMLAllCollection): Updated for namedItems name change.
Also removed explicit Node* type from result of namedItemWithIndex, since that
function now returns a more specific type.
(WebCore::JSHTMLAllCollection::nameGetter): Update for namedItems name change.
(WebCore::JSHTMLAllCollection::item): Ditto.
(WebCore::JSHTMLAllCollection::namedItem): Ditto.
* bindings/js/JSHTMLFormControlsCollectionCustom.cpp: Removed some unneeded includes.
(WebCore::namedItems): Updated name to match WebKit coding style, and also
updated to use the return value from namedItems, which now returns a Vector.
(WebCore::JSHTMLFormControlsCollection::nameGetter): Update for namedItems name change.
(WebCore::JSHTMLFormControlsCollection::namedItem): Ditto.
* bindings/js/JSHTMLFormElementCustom.cpp:
(WebCore::JSHTMLFormElement::nameGetter): Updated to use the return value from
namedItems, which now returns a Vector.
* html/HTMLAllCollection.cpp:
(WebCore::HTMLAllCollection::HTMLAllCollection): Marked the constructor inline,
since it's only used in one place, the create function.
(WebCore::HTMLAllCollection::~HTMLAllCollection): Deleted. No need to have an
explicit destructor since there's nothing special to implement, and includers of
the header file have everything they ened to compile the compiler-generated one.
(WebCore::HTMLAllCollection::namedItemWithIndex): Changed return type to Element.
* html/HTMLAllCollection.h: Removed unneeded explicit declaration of destructor.
Chagned return type of namedItemWithIndex to Element.
* html/HTMLCollection.cpp:
(WebCore::HTMLCollection::rootTypeFromCollectionType): Marked this inline. Also
changed this to be a static member function so it can use the RootType enum, which
is now private to the class.
(WebCore::isMatchingHTMLElement): Marked this function static so it will get
internal linkage.
(WebCore::isMatchingElement): Ditto.
(WebCore::previousElement): Marked this function inline since it's called in only
one place. Changed argument type to a reference since it can never be null.
(WebCore::HTMLCollection::iterateForPreviousElement): Changed argument name and
also updated for above changes.
(WebCore::firstMatchingElement): Marked this function static so it will get
internal linkage.
(WebCore::nextMatchingElement): Ditto. Changed argument type to a reference
since it can never be null.
(WebCore::HTMLCollection::item): Changed return type to Element.
(WebCore::nameShouldBeVisibleInDocumentAll): Added an overload that takes an
Element. This streamlines the code below that calls it so it fits on one line.
(WebCore::firstMatchingChildElement): Marked this function static so it will get
internal linkage.
(WebCore::nextMatchingSiblingElement): Ditto. Changed argument type to a reference
since it can never be null.
(WebCore::HTMLCollection::usesCustomForwardOnlyTraversal): Moved here from the
header since, although it's marked inline, it's only used inside this file.
(WebCore::HTMLCollection::traverseForward): Restructured the code a little bit
to make the function smaller and possibly easier to read. This does add one
redundant null check, but it seems OK to do that.
(WebCore::HTMLCollection::collectionTraverseBackward): Tweaked foramtting a bit.
(WebCore::HTMLCollection::namedItem): Changed return type to Element. Tightened
the code that calls nameShouldBeVisibleInDocumentAll so it fits better on one line.
Changed code that handles m_shouldOnlyIncludeDirectChildren to use a nested if
instead of an && since it makes the code a little easier to read.
(WebCore::HTMLCollection::updateNamedElementCache): Tweaked code a little bit,
using shorter variable names, and using references instead of pointers. Also removed
the call to didPopulate, since setNamedItemCache now takes care of that.
(WebCore::HTMLCollection::namedItems): Changed to return a Vector instead of
appending to an existing one. Also use reserveInitialCapacity and uncheckedAppend
for better performance. Added a FIXME, because there seems to be something wrong
here about this being non-virtual. Made other small tweaks to streamline the code.
(WebCore::HTMLCollection::customElementAfter): Moved this here from the header.
There is no reason to need to inline this.
* html/HTMLCollection.h: Removed unneeded includes. Moved function bodies out
of the class definitions so the class definitions are easier to read. Made some
functions that were formerly public or protected be private instead. Added a call
to didPopulate to setNamedItemCache so the callers don't have to do it.
* html/HTMLFormControlsCollection.cpp:
(WebCore::HTMLFormControlsCollection::namedItem): Changed return value to Element.
Tweaked coding style a little bit.
(WebCore::HTMLFormControlsCollection::updateNamedElementCache): Rearranged to
simplify a bit. Don't build the foundInputElements set when the owner is not a
form element, since we don't use the set in that case. Use shorter variable names,
and modern for loops. Also removed the call to didPopulate, since setNamedItemCache
now takes care of that.
* html/HTMLFormControlsCollection.h: Removed some uneeded forward declarations.
Updated return type for namedItem, and also made the override private.
* html/HTMLFormElement.cpp:
(WebCore::HTMLFormElement::namedElements): Changed to return a Vector and updated
function name accordingly.
* html/HTMLFormElement.h: Ditto.
* html/HTMLNameCollection.h: Removed a stray blank line.
* html/HTMLSelectElement.cpp:
(WebCore::HTMLSelectElement::namedItem): Changed return value to Element.
(WebCore::HTMLSelectElement::item): Ditto.
* html/HTMLSelectElement.h: Ditto.
* page/scrolling/AxisScrollSnapOffsets.cpp:
(WebCore::appendChildSnapOffsets): Rewrote loop as a for loop rather than a while
loop. Removed unwanted use of children()->collectionBegin() to get the first element
child of an HTMLElement. This function uses a mix of DOM and rendering functions that
is probably incorrect, but I did not tackle fixing that at this time.</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="#trunkSourceWebCorebindingsjsJSHTMLAllCollectionCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLFormControlsCollectionCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLFormElementCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLFormElementCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAllCollectioncpp">trunk/Source/WebCore/html/HTMLAllCollection.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="#trunkSourceWebCorehtmlHTMLFormControlsCollectioncpp">trunk/Source/WebCore/html/HTMLFormControlsCollection.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlsCollectionh">trunk/Source/WebCore/html/HTMLFormControlsCollection.h</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="#trunkSourceWebCorehtmlHTMLNameCollectionh">trunk/Source/WebCore/html/HTMLNameCollection.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementcpp">trunk/Source/WebCore/html/HTMLSelectElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementh">trunk/Source/WebCore/html/HTMLSelectElement.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAxisScrollSnapOffsetscpp">trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175946 => 175947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-11 17:33:43 UTC (rev 175946)
+++ trunk/Source/WebCore/ChangeLog 2014-11-11 17:35:29 UTC (rev 175947)
</span><span class="lines">@@ -1,3 +1,123 @@
</span><ins>+2014-11-09 Darin Adler <darin@apple.com>
+
+ Minor tweaks to HTMLCollection
+ https://bugs.webkit.org/show_bug.cgi?id=138556
+
+ Reviewed by Chris Dumez.
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::addRadioButtonGroupMembers):
+ Update for namedElements function that now returns a Vector; also use
+ a new style for loop to iterate it.
+
+ * bindings/js/JSHTMLAllCollectionCustom.cpp: Removed some unneeded includes.
+ (WebCore::namedItems): Updated name to match WebKit coding style, and also
+ updated to use the return value from namedItems, which now returns a Vector.
+ (WebCore::callHTMLAllCollection): Updated for namedItems name change.
+ Also removed explicit Node* type from result of namedItemWithIndex, since that
+ function now returns a more specific type.
+ (WebCore::JSHTMLAllCollection::nameGetter): Update for namedItems name change.
+ (WebCore::JSHTMLAllCollection::item): Ditto.
+ (WebCore::JSHTMLAllCollection::namedItem): Ditto.
+
+ * bindings/js/JSHTMLFormControlsCollectionCustom.cpp: Removed some unneeded includes.
+ (WebCore::namedItems): Updated name to match WebKit coding style, and also
+ updated to use the return value from namedItems, which now returns a Vector.
+ (WebCore::JSHTMLFormControlsCollection::nameGetter): Update for namedItems name change.
+ (WebCore::JSHTMLFormControlsCollection::namedItem): Ditto.
+
+ * bindings/js/JSHTMLFormElementCustom.cpp:
+ (WebCore::JSHTMLFormElement::nameGetter): Updated to use the return value from
+ namedItems, which now returns a Vector.
+
+ * html/HTMLAllCollection.cpp:
+ (WebCore::HTMLAllCollection::HTMLAllCollection): Marked the constructor inline,
+ since it's only used in one place, the create function.
+ (WebCore::HTMLAllCollection::~HTMLAllCollection): Deleted. No need to have an
+ explicit destructor since there's nothing special to implement, and includers of
+ the header file have everything they ened to compile the compiler-generated one.
+ (WebCore::HTMLAllCollection::namedItemWithIndex): Changed return type to Element.
+
+ * html/HTMLAllCollection.h: Removed unneeded explicit declaration of destructor.
+ Chagned return type of namedItemWithIndex to Element.
+
+ * html/HTMLCollection.cpp:
+ (WebCore::HTMLCollection::rootTypeFromCollectionType): Marked this inline. Also
+ changed this to be a static member function so it can use the RootType enum, which
+ is now private to the class.
+ (WebCore::isMatchingHTMLElement): Marked this function static so it will get
+ internal linkage.
+ (WebCore::isMatchingElement): Ditto.
+ (WebCore::previousElement): Marked this function inline since it's called in only
+ one place. Changed argument type to a reference since it can never be null.
+ (WebCore::HTMLCollection::iterateForPreviousElement): Changed argument name and
+ also updated for above changes.
+ (WebCore::firstMatchingElement): Marked this function static so it will get
+ internal linkage.
+ (WebCore::nextMatchingElement): Ditto. Changed argument type to a reference
+ since it can never be null.
+ (WebCore::HTMLCollection::item): Changed return type to Element.
+ (WebCore::nameShouldBeVisibleInDocumentAll): Added an overload that takes an
+ Element. This streamlines the code below that calls it so it fits on one line.
+ (WebCore::firstMatchingChildElement): Marked this function static so it will get
+ internal linkage.
+ (WebCore::nextMatchingSiblingElement): Ditto. Changed argument type to a reference
+ since it can never be null.
+ (WebCore::HTMLCollection::usesCustomForwardOnlyTraversal): Moved here from the
+ header since, although it's marked inline, it's only used inside this file.
+ (WebCore::HTMLCollection::traverseForward): Restructured the code a little bit
+ to make the function smaller and possibly easier to read. This does add one
+ redundant null check, but it seems OK to do that.
+ (WebCore::HTMLCollection::collectionTraverseBackward): Tweaked foramtting a bit.
+ (WebCore::HTMLCollection::namedItem): Changed return type to Element. Tightened
+ the code that calls nameShouldBeVisibleInDocumentAll so it fits better on one line.
+ Changed code that handles m_shouldOnlyIncludeDirectChildren to use a nested if
+ instead of an && since it makes the code a little easier to read.
+ (WebCore::HTMLCollection::updateNamedElementCache): Tweaked code a little bit,
+ using shorter variable names, and using references instead of pointers. Also removed
+ the call to didPopulate, since setNamedItemCache now takes care of that.
+ (WebCore::HTMLCollection::namedItems): Changed to return a Vector instead of
+ appending to an existing one. Also use reserveInitialCapacity and uncheckedAppend
+ for better performance. Added a FIXME, because there seems to be something wrong
+ here about this being non-virtual. Made other small tweaks to streamline the code.
+ (WebCore::HTMLCollection::customElementAfter): Moved this here from the header.
+ There is no reason to need to inline this.
+
+ * html/HTMLCollection.h: Removed unneeded includes. Moved function bodies out
+ of the class definitions so the class definitions are easier to read. Made some
+ functions that were formerly public or protected be private instead. Added a call
+ to didPopulate to setNamedItemCache so the callers don't have to do it.
+
+ * html/HTMLFormControlsCollection.cpp:
+ (WebCore::HTMLFormControlsCollection::namedItem): Changed return value to Element.
+ Tweaked coding style a little bit.
+ (WebCore::HTMLFormControlsCollection::updateNamedElementCache): Rearranged to
+ simplify a bit. Don't build the foundInputElements set when the owner is not a
+ form element, since we don't use the set in that case. Use shorter variable names,
+ and modern for loops. Also removed the call to didPopulate, since setNamedItemCache
+ now takes care of that.
+
+ * html/HTMLFormControlsCollection.h: Removed some uneeded forward declarations.
+ Updated return type for namedItem, and also made the override private.
+
+ * html/HTMLFormElement.cpp:
+ (WebCore::HTMLFormElement::namedElements): Changed to return a Vector and updated
+ function name accordingly.
+ * html/HTMLFormElement.h: Ditto.
+
+ * html/HTMLNameCollection.h: Removed a stray blank line.
+
+ * html/HTMLSelectElement.cpp:
+ (WebCore::HTMLSelectElement::namedItem): Changed return value to Element.
+ (WebCore::HTMLSelectElement::item): Ditto.
+ * html/HTMLSelectElement.h: Ditto.
+
+ * page/scrolling/AxisScrollSnapOffsets.cpp:
+ (WebCore::appendChildSnapOffsets): Rewrote loop as a for loop rather than a while
+ loop. Removed unwanted use of children()->collectionBegin() to get the first element
+ child of an HTMLElement. This function uses a mix of DOM and rendering functions that
+ is probably incorrect, but I did not tackle fixing that at this time.
+
</ins><span class="cx"> 2014-11-11 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] WebCore includes unused cursor image resources
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (175946 => 175947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-11-11 17:33:43 UTC (rev 175946)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-11-11 17:35:29 UTC (rev 175947)
</span><span class="lines">@@ -949,10 +949,7 @@
</span><span class="cx"> HTMLInputElement& input = downcast<HTMLInputElement>(*node);
</span><span class="cx"> // if there's a form, then this is easy
</span><span class="cx"> if (input.form()) {
</span><del>- Vector<Ref<Element>> formElements;
- input.form()->getNamedElements(input.name(), formElements);
-
- for (auto& associateElement : formElements) {
</del><ins>+ for (auto& associateElement : input.form()->namedElements(input.name())) {
</ins><span class="cx"> if (AccessibilityObject* object = axObjectCache()->getOrCreate(&associateElement.get()))
</span><span class="cx"> linkedUIElements.append(object);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLAllCollectionCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp (175946 => 175947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp 2014-11-11 17:33:43 UTC (rev 175946)
+++ trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp 2014-11-11 17:35:29 UTC (rev 175947)
</span><span class="lines">@@ -27,24 +27,18 @@
</span><span class="cx"> #include "JSHTMLAllCollection.h"
</span><span class="cx">
</span><span class="cx"> #include "HTMLAllCollection.h"
</span><del>-#include "JSDOMBinding.h"
</del><span class="cx"> #include "JSNode.h"
</span><span class="cx"> #include "JSNodeList.h"
</span><del>-#include "Node.h"
</del><span class="cx"> #include "StaticNodeList.h"
</span><span class="cx"> #include <runtime/IdentifierInlines.h>
</span><del>-#include <runtime/JSCJSValue.h>
-#include <wtf/Vector.h>
-#include <wtf/text/AtomicString.h>
</del><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static JSValue getNamedItems(ExecState* exec, JSHTMLAllCollection* collection, PropertyName propertyName)
</del><ins>+static JSValue namedItems(ExecState* exec, JSHTMLAllCollection* collection, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- Vector<Ref<Element>> namedItems;
- collection->impl().namedItems(propertyNameToAtomicString(propertyName), namedItems);
</del><ins>+ Vector<Ref<Element>> namedItems = collection->impl().namedItems(propertyNameToAtomicString(propertyName));
</ins><span class="cx">
</span><span class="cx"> if (namedItems.isEmpty())
</span><span class="cx"> return jsUndefined();
</span><span class="lines">@@ -76,15 +70,15 @@
</span><span class="cx"> return JSValue::encode(toJS(exec, jsCollection->globalObject(), collection.item(index)));
</span><span class="cx">
</span><span class="cx"> // Support for document.images('<name>') etc.
</span><del>- return JSValue::encode(getNamedItems(exec, jsCollection, Identifier(exec, string)));
</del><ins>+ return JSValue::encode(namedItems(exec, jsCollection, Identifier(exec, string)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // The second arg, if set, is the index of the item we want
</span><span class="cx"> String string = exec->argument(0).toString(exec)->value(exec);
</span><span class="cx"> unsigned index = toUInt32FromStringImpl(exec->argument(1).toWTFString(exec).impl());
</span><span class="cx"> if (index != PropertyName::NotAnIndex) {
</span><del>- if (Node* node = collection.namedItemWithIndex(string, index))
- return JSValue::encode(toJS(exec, jsCollection->globalObject(), node));
</del><ins>+ if (auto* item = collection.namedItemWithIndex(string, index))
+ return JSValue::encode(toJS(exec, jsCollection->globalObject(), item));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -104,7 +98,7 @@
</span><span class="cx"> EncodedJSValue JSHTMLAllCollection::nameGetter(ExecState* exec, JSObject* slotBase, EncodedJSValue, PropertyName propertyName)
</span><span class="cx"> {
</span><span class="cx"> JSHTMLAllCollection* thisObj = jsCast<JSHTMLAllCollection*>(slotBase);
</span><del>- return JSValue::encode(getNamedItems(exec, thisObj, propertyName));
</del><ins>+ return JSValue::encode(namedItems(exec, thisObj, propertyName));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSHTMLAllCollection::item(ExecState* exec)
</span><span class="lines">@@ -112,12 +106,12 @@
</span><span class="cx"> uint32_t index = toUInt32FromStringImpl(exec->argument(0).toString(exec)->value(exec).impl());
</span><span class="cx"> if (index != PropertyName::NotAnIndex)
</span><span class="cx"> return toJS(exec, globalObject(), impl().item(index));
</span><del>- return getNamedItems(exec, this, Identifier(exec, exec->argument(0).toString(exec)->value(exec)));
</del><ins>+ return namedItems(exec, this, Identifier(exec, exec->argument(0).toString(exec)->value(exec)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSHTMLAllCollection::namedItem(ExecState* exec)
</span><span class="cx"> {
</span><del>- JSValue value = getNamedItems(exec, this, Identifier(exec, exec->argument(0).toString(exec)->value(exec)));
</del><ins>+ JSValue value = namedItems(exec, this, Identifier(exec, exec->argument(0).toString(exec)->value(exec)));
</ins><span class="cx"> return value.isUndefined() ? jsNull() : value;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLFormControlsCollectionCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp (175946 => 175947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp 2014-11-11 17:33:43 UTC (rev 175946)
+++ trunk/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp 2014-11-11 17:35:29 UTC (rev 175947)
</span><span class="lines">@@ -18,31 +18,22 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#include "HTMLFormControlsCollection.h"
-
-
-#include "HTMLAllCollection.h"
-#include "JSDOMBinding.h"
-#include "JSHTMLCollection.h"
</del><span class="cx"> #include "JSHTMLFormControlsCollection.h"
</span><ins>+
+#include "HTMLFormControlsCollection.h"
</ins><span class="cx"> #include "JSNode.h"
</span><del>-#include "JSNodeList.h"
</del><span class="cx"> #include "JSRadioNodeList.h"
</span><del>-#include "Node.h"
</del><span class="cx"> #include "RadioNodeList.h"
</span><span class="cx"> #include <runtime/IdentifierInlines.h>
</span><del>-#include <wtf/Vector.h>
-#include <wtf/text/AtomicString.h>
</del><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static JSValue getNamedItems(ExecState* exec, JSHTMLFormControlsCollection* collection, PropertyName propertyName)
</del><ins>+static JSValue namedItems(ExecState* exec, JSHTMLFormControlsCollection* collection, PropertyName propertyName)
</ins><span class="cx"> {
</span><del>- Vector<Ref<Element>> namedItems;
</del><span class="cx"> const AtomicString& name = propertyNameToAtomicString(propertyName);
</span><del>- collection->impl().namedItems(name, namedItems);
</del><ins>+ Vector<Ref<Element>> namedItems = collection->impl().namedItems(name);
</ins><span class="cx">
</span><span class="cx"> if (namedItems.isEmpty())
</span><span class="cx"> return jsUndefined();
</span><span class="lines">@@ -61,12 +52,12 @@
</span><span class="cx"> EncodedJSValue JSHTMLFormControlsCollection::nameGetter(ExecState* exec, JSObject* slotBase, EncodedJSValue, PropertyName propertyName)
</span><span class="cx"> {
</span><span class="cx"> JSHTMLFormControlsCollection* thisObj = jsCast<JSHTMLFormControlsCollection*>(slotBase);
</span><del>- return JSValue::encode(getNamedItems(exec, thisObj, propertyName));
</del><ins>+ return JSValue::encode(namedItems(exec, thisObj, propertyName));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSHTMLFormControlsCollection::namedItem(ExecState* exec)
</span><span class="cx"> {
</span><del>- JSValue value = getNamedItems(exec, this, Identifier(exec, exec->argument(0).toString(exec)->value(exec)));
</del><ins>+ JSValue value = namedItems(exec, this, Identifier(exec, exec->argument(0).toString(exec)->value(exec)));
</ins><span class="cx"> return value.isUndefined() ? jsNull() : value;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLFormElementCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLFormElementCustom.cpp (175946 => 175947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLFormElementCustom.cpp 2014-11-11 17:33:43 UTC (rev 175946)
+++ trunk/Source/WebCore/bindings/js/JSHTMLFormElementCustom.cpp 2014-11-11 17:35:29 UTC (rev 175947)
</span><span class="lines">@@ -47,8 +47,7 @@
</span><span class="cx"> JSHTMLFormElement* jsForm = jsCast<JSHTMLFormElement*>(slotBase);
</span><span class="cx"> HTMLFormElement& form = jsForm->impl();
</span><span class="cx">
</span><del>- Vector<Ref<Element>> namedItems;
- form.getNamedElements(propertyNameToAtomicString(propertyName), namedItems);
</del><ins>+ Vector<Ref<Element>> namedItems = form.namedElements(propertyNameToAtomicString(propertyName));
</ins><span class="cx">
</span><span class="cx"> if (namedItems.isEmpty())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAllCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAllCollection.cpp (175946 => 175947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAllCollection.cpp 2014-11-11 17:33:43 UTC (rev 175946)
+++ trunk/Source/WebCore/html/HTMLAllCollection.cpp 2014-11-11 17:35:29 UTC (rev 175947)
</span><span class="lines">@@ -35,17 +35,13 @@
</span><span class="cx"> return adoptRef(*new HTMLAllCollection(document, type));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HTMLAllCollection::HTMLAllCollection(Document& document, CollectionType type)
</del><ins>+inline HTMLAllCollection::HTMLAllCollection(Document& document, CollectionType type)
</ins><span class="cx"> : HTMLCollection(document, type)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HTMLAllCollection::~HTMLAllCollection()
</del><ins>+Element* HTMLAllCollection::namedItemWithIndex(const AtomicString& name, unsigned index) const
</ins><span class="cx"> {
</span><del>-}
-
-Node* HTMLAllCollection::namedItemWithIndex(const AtomicString& name, unsigned index) const
-{
</del><span class="cx"> updateNamedElementCache();
</span><span class="cx"> const CollectionNamedElementCache& cache = namedItemCaches();
</span><span class="cx">
</span><span class="lines">@@ -60,7 +56,7 @@
</span><span class="cx"> return elements->at(index);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAllCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAllCollection.h (175946 => 175947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAllCollection.h 2014-11-11 17:33:43 UTC (rev 175946)
+++ trunk/Source/WebCore/html/HTMLAllCollection.h 2014-11-11 17:35:29 UTC (rev 175947)
</span><span class="lines">@@ -33,9 +33,8 @@
</span><span class="cx"> class HTMLAllCollection final : public HTMLCollection {
</span><span class="cx"> public:
</span><span class="cx"> static PassRef<HTMLAllCollection> create(Document&, CollectionType);
</span><del>- virtual ~HTMLAllCollection();
</del><span class="cx">
</span><del>- Node* namedItemWithIndex(const AtomicString& name, unsigned index) const;
</del><ins>+ Element* namedItemWithIndex(const AtomicString& name, unsigned index) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> HTMLAllCollection(Document&, CollectionType);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCollection.cpp (175946 => 175947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCollection.cpp 2014-11-11 17:33:43 UTC (rev 175946)
+++ trunk/Source/WebCore/html/HTMLCollection.cpp 2014-11-11 17:35:29 UTC (rev 175947)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static HTMLCollection::RootType rootTypeFromCollectionType(CollectionType type)
</del><ins>+inline auto HTMLCollection::rootTypeFromCollectionType(CollectionType type) -> RootType
</ins><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="cx"> case DocImages:
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> return ownerNode();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool isMatchingHTMLElement(const HTMLCollection& collection, HTMLElement& element)
</del><ins>+static inline bool isMatchingHTMLElement(const HTMLCollection& collection, HTMLElement& element)
</ins><span class="cx"> {
</span><span class="cx"> switch (collection.type()) {
</span><span class="cx"> case DocImages:
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool isMatchingElement(const HTMLCollection& collection, Element& element)
</del><ins>+static inline bool isMatchingElement(const HTMLCollection& collection, Element& element)
</ins><span class="cx"> {
</span><span class="cx"> // Collection types that deal with any type of Elements, not just HTMLElements.
</span><span class="cx"> switch (collection.type()) {
</span><span class="lines">@@ -233,23 +233,23 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Element* previousElement(ContainerNode& base, Element* previous, bool onlyIncludeDirectChildren)
</del><ins>+static inline Element* previousElement(ContainerNode& base, Element& element, bool onlyIncludeDirectChildren)
</ins><span class="cx"> {
</span><del>- return onlyIncludeDirectChildren ? ElementTraversal::previousSibling(previous) : ElementTraversal::previous(previous, &base);
</del><ins>+ return onlyIncludeDirectChildren ? ElementTraversal::previousSibling(&element) : ElementTraversal::previous(&element, &base);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-ALWAYS_INLINE Element* HTMLCollection::iterateForPreviousElement(Element* current) const
</del><ins>+ALWAYS_INLINE Element* HTMLCollection::iterateForPreviousElement(Element* element) const
</ins><span class="cx"> {
</span><span class="cx"> bool onlyIncludeDirectChildren = m_shouldOnlyIncludeDirectChildren;
</span><span class="cx"> ContainerNode& rootNode = this->rootNode();
</span><del>- for (; current; current = previousElement(rootNode, current, onlyIncludeDirectChildren)) {
- if (isMatchingElement(*this, *current))
- return current;
</del><ins>+ for (; element; element = previousElement(rootNode, *element, onlyIncludeDirectChildren)) {
+ if (isMatchingElement(*this, *element))
+ return element;
</ins><span class="cx"> }
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Element* firstMatchingElement(const HTMLCollection& collection, ContainerNode& root)
</del><ins>+static inline Element* firstMatchingElement(const HTMLCollection& collection, ContainerNode& root)
</ins><span class="cx"> {
</span><span class="cx"> Element* element = ElementTraversal::firstWithin(&root);
</span><span class="cx"> while (element && !isMatchingElement(collection, *element))
</span><span class="lines">@@ -257,12 +257,13 @@
</span><span class="cx"> return element;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Element* nextMatchingElement(const HTMLCollection& collection, Element* current, ContainerNode& root)
</del><ins>+static inline Element* nextMatchingElement(const HTMLCollection& collection, Element& element, ContainerNode& root)
</ins><span class="cx"> {
</span><ins>+ Element* next = &element;
</ins><span class="cx"> do {
</span><del>- current = ElementTraversal::next(current, &root);
- } while (current && !isMatchingElement(collection, *current));
- return current;
</del><ins>+ next = ElementTraversal::next(next, &root);
+ } while (next && !isMatchingElement(collection, *next));
+ return next;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned HTMLCollection::length() const
</span><span class="lines">@@ -270,7 +271,7 @@
</span><span class="cx"> return m_indexCache.nodeCount(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Node* HTMLCollection::item(unsigned offset) const
</del><ins>+Element* HTMLCollection::item(unsigned offset) const
</ins><span class="cx"> {
</span><span class="cx"> return m_indexCache.nodeAt(*this, offset);
</span><span class="cx"> }
</span><span class="lines">@@ -288,22 +289,33 @@
</span><span class="cx"> || element.hasTagName(selectTag);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Element* firstMatchingChildElement(const HTMLCollection& nodeList, ContainerNode& root)
</del><ins>+static inline bool nameShouldBeVisibleInDocumentAll(Element& element)
</ins><span class="cx"> {
</span><ins>+ return is<HTMLElement>(element) && nameShouldBeVisibleInDocumentAll(downcast<HTMLElement>(element));
+}
+
+static inline Element* firstMatchingChildElement(const HTMLCollection& nodeList, ContainerNode& root)
+{
</ins><span class="cx"> Element* element = ElementTraversal::firstWithin(&root);
</span><span class="cx"> while (element && !isMatchingElement(nodeList, *element))
</span><span class="cx"> element = ElementTraversal::nextSibling(element);
</span><span class="cx"> return element;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Element* nextMatchingSiblingElement(const HTMLCollection& nodeList, Element* current)
</del><ins>+static inline Element* nextMatchingSiblingElement(const HTMLCollection& nodeList, Element& element)
</ins><span class="cx"> {
</span><ins>+ Element* next = &element;
</ins><span class="cx"> do {
</span><del>- current = ElementTraversal::nextSibling(current);
- } while (current && !isMatchingElement(nodeList, *current));
- return current;
</del><ins>+ next = ElementTraversal::nextSibling(next);
+ } while (next && !isMatchingElement(nodeList, *next));
+ return next;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool HTMLCollection::usesCustomForwardOnlyTraversal() const
+{
+ return m_usesCustomForwardOnlyTraversal;
+}
+
</ins><span class="cx"> inline Element* HTMLCollection::firstElement(ContainerNode& root) const
</span><span class="cx"> {
</span><span class="cx"> if (usesCustomForwardOnlyTraversal())
</span><span class="lines">@@ -317,26 +329,15 @@
</span><span class="cx"> {
</span><span class="cx"> Element* element = &current;
</span><span class="cx"> if (usesCustomForwardOnlyTraversal()) {
</span><del>- for (traversedCount = 0; traversedCount < count; ++traversedCount) {
</del><ins>+ for (traversedCount = 0; element && traversedCount < count; ++traversedCount)
</ins><span class="cx"> element = customElementAfter(element);
</span><del>- if (!element)
- return nullptr;
- }
- return element;
</del><ins>+ } else if (m_shouldOnlyIncludeDirectChildren) {
+ for (traversedCount = 0; element && traversedCount < count; ++traversedCount)
+ element = nextMatchingSiblingElement(*this, *element);
+ } else {
+ for (traversedCount = 0; element && traversedCount < count; ++traversedCount)
+ element = nextMatchingElement(*this, *element, root);
</ins><span class="cx"> }
</span><del>- if (m_shouldOnlyIncludeDirectChildren) {
- for (traversedCount = 0; traversedCount < count; ++traversedCount) {
- element = nextMatchingSiblingElement(*this, element);
- if (!element)
- return nullptr;
- }
- return element;
- }
- for (traversedCount = 0; traversedCount < count; ++traversedCount) {
- element = nextMatchingElement(*this, element, root);
- if (!element)
- return nullptr;
- }
</del><span class="cx"> return element;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -361,13 +362,13 @@
</span><span class="cx"> void HTMLCollection::collectionTraverseBackward(Element*& current, unsigned count) const
</span><span class="cx"> {
</span><span class="cx"> // FIXME: This should be optimized similarly to the forward case.
</span><del>- auto& root = rootNode();
</del><span class="cx"> if (m_shouldOnlyIncludeDirectChildren) {
</span><del>- for (; count && current ; --count)
</del><ins>+ for (; count && current; --count)
</ins><span class="cx"> current = iterateForPreviousElement(ElementTraversal::previousSibling(current));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- for (; count && current ; --count)
</del><ins>+ auto& root = rootNode();
+ for (; count && current; --count)
</ins><span class="cx"> current = iterateForPreviousElement(ElementTraversal::previous(current, &root));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -388,7 +389,7 @@
</span><span class="cx"> m_namedElementCache = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Node* HTMLCollection::namedItem(const AtomicString& name) const
</del><ins>+Element* HTMLCollection::namedItem(const AtomicString& name) const
</ins><span class="cx"> {
</span><span class="cx"> // http://msdn.microsoft.com/workshop/author/dhtml/reference/methods/nameditem.asp
</span><span class="cx"> // This method first searches for an object with a matching id
</span><span class="lines">@@ -401,23 +402,25 @@
</span><span class="cx">
</span><span class="cx"> ContainerNode& root = rootNode();
</span><span class="cx"> if (!usesCustomForwardOnlyTraversal() && root.isInTreeScope()) {
</span><ins>+ Element* candidate = nullptr;
+
</ins><span class="cx"> TreeScope& treeScope = root.treeScope();
</span><del>- Element* candidate = nullptr;
</del><span class="cx"> if (treeScope.hasElementWithId(*name.impl())) {
</span><span class="cx"> if (!treeScope.containsMultipleElementsWithId(name))
</span><span class="cx"> candidate = treeScope.getElementById(name);
</span><span class="cx"> } else if (treeScope.hasElementWithName(*name.impl())) {
</span><span class="cx"> if (!treeScope.containsMultipleElementsWithName(name)) {
</span><span class="cx"> candidate = treeScope.getElementByName(name);
</span><del>- if (candidate && type() == DocAll && (!is<HTMLElement>(*candidate) || !nameShouldBeVisibleInDocumentAll(downcast<HTMLElement>(*candidate))))
</del><ins>+ if (candidate && type() == DocAll && !nameShouldBeVisibleInDocumentAll(*candidate))
</ins><span class="cx"> candidate = nullptr;
</span><span class="cx"> }
</span><span class="cx"> } else
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- if (candidate && isMatchingElement(*this, *candidate)
- && (m_shouldOnlyIncludeDirectChildren ? candidate->parentNode() == &root : candidate->isDescendantOf(&root)))
- return candidate;
</del><ins>+ if (candidate && isMatchingElement(*this, *candidate)) {
+ if (m_shouldOnlyIncludeDirectChildren ? candidate->parentNode() == &root : candidate->isDescendantOf(&root))
+ return candidate;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // The pathological case. We need to walk the entire subtree.
</span><span class="lines">@@ -442,25 +445,22 @@
</span><span class="cx"> if (hasNamedElementCache())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-
</del><span class="cx"> auto cache = std::make_unique<CollectionNamedElementCache>();
</span><span class="cx">
</span><span class="cx"> unsigned size = m_indexCache.nodeCount(*this);
</span><del>- for (unsigned i = 0; i < size; i++) {
- Element* element = m_indexCache.nodeAt(*this, i);
- ASSERT(element);
- const AtomicString& idAttrVal = element->getIdAttribute();
- if (!idAttrVal.isEmpty())
- cache->appendIdCache(idAttrVal, element);
- if (!is<HTMLElement>(*element))
</del><ins>+ for (unsigned i = 0; i < size; ++i) {
+ Element& element = *m_indexCache.nodeAt(*this, i);
+ const AtomicString& id = element.getIdAttribute();
+ if (!id.isEmpty())
+ cache->appendToIdCache(id, element);
+ if (!is<HTMLElement>(element))
</ins><span class="cx"> continue;
</span><del>- const AtomicString& nameAttrVal = element->getNameAttribute();
- if (!nameAttrVal.isEmpty() && idAttrVal != nameAttrVal && (type() != DocAll || nameShouldBeVisibleInDocumentAll(downcast<HTMLElement>(*element))))
- cache->appendNameCache(nameAttrVal, element);
</del><ins>+ const AtomicString& name = element.getNameAttribute();
+ if (!name.isEmpty() && id != name && (type() != DocAll || nameShouldBeVisibleInDocumentAll(downcast<HTMLElement>(element))))
+ cache->appendToNameCache(name, element);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- cache->didPopulate();
- setNameItemCache(WTF::move(cache));
</del><ins>+ setNamedItemCache(WTF::move(cache));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLCollection::hasNamedItem(const AtomicString& name) const
</span><span class="lines">@@ -469,23 +469,34 @@
</span><span class="cx"> return namedItem(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLCollection::namedItems(const AtomicString& name, Vector<Ref<Element>>& result) const
</del><ins>+Vector<Ref<Element>> HTMLCollection::namedItems(const AtomicString& name) const
</ins><span class="cx"> {
</span><del>- ASSERT(result.isEmpty());
</del><ins>+ // FIXME: This non-virtual function can't possibly be doing the correct thing for
+ // any derived class that overrides the virtual namedItem function.
+
+ Vector<Ref<Element>> elements;
+
</ins><span class="cx"> if (name.isEmpty())
</span><del>- return;
</del><ins>+ return elements;
</ins><span class="cx">
</span><span class="cx"> updateNamedElementCache();
</span><span class="cx"> ASSERT(m_namedElementCache);
</span><span class="cx">
</span><del>- const Vector<Element*>* idResults = m_namedElementCache->findElementsWithId(name);
- const Vector<Element*>* nameResults = m_namedElementCache->findElementsWithName(name);
</del><ins>+ auto* elementsWithId = m_namedElementCache->findElementsWithId(name);
+ auto* elementsWithName = m_namedElementCache->findElementsWithName(name);
</ins><span class="cx">
</span><del>- for (unsigned i = 0; idResults && i < idResults->size(); ++i)
- result.append(*idResults->at(i));
</del><ins>+ elements.reserveInitialCapacity((elementsWithId ? elementsWithId->size() : 0) + (elementsWithName ? elementsWithName->size() : 0));
</ins><span class="cx">
</span><del>- for (unsigned i = 0; nameResults && i < nameResults->size(); ++i)
- result.append(*nameResults->at(i));
</del><ins>+ if (elementsWithId) {
+ for (auto& element : *elementsWithId)
+ elements.uncheckedAppend(*element);
+ }
+ if (elementsWithName) {
+ for (auto& element : *elementsWithName)
+ elements.uncheckedAppend(*element);
+ }
+
+ return elements;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<NodeList> HTMLCollection::tags(const String& name)
</span><span class="lines">@@ -493,4 +504,10 @@
</span><span class="cx"> return ownerNode().getElementsByTagName(name);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Element* HTMLCollection::customElementAfter(Element*) const
+{
+ ASSERT_NOT_REACHED();
+ return nullptr;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLCollection.h (175946 => 175947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLCollection.h 2014-11-11 17:33:43 UTC (rev 175946)
+++ trunk/Source/WebCore/html/HTMLCollection.h 2014-11-11 17:35:29 UTC (rev 175947)
</span><span class="lines">@@ -24,17 +24,10 @@
</span><span class="cx"> #define HTMLCollection_h
</span><span class="cx">
</span><span class="cx"> #include "CollectionIndexCache.h"
</span><del>-#include "CollectionType.h"
-#include "ContainerNode.h"
-#include "Document.h"
</del><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "LiveNodeList.h"
</span><span class="cx"> #include "ScriptWrappable.h"
</span><del>-#include <memory>
-#include <wtf/Forward.h>
</del><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/TypeCasts.h>
-#include <wtf/Vector.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -42,47 +35,26 @@
</span><span class="cx">
</span><span class="cx"> class CollectionNamedElementCache {
</span><span class="cx"> public:
</span><del>-#ifndef ASSERT_DISABLED
- CollectionNamedElementCache : m_didPopulateCalled(false) { }
-#endif
</del><ins>+ const Vector<Element*>* findElementsWithId(const AtomicString& id) const;
+ const Vector<Element*>* findElementsWithName(const AtomicString& name) const;
</ins><span class="cx">
</span><del>- const Vector<Element*>* findElementsWithId(const AtomicString& id) const { return find(m_idToElementsMap, id); }
- const Vector<Element*>* findElementsWithName(const AtomicString& name) const { return find(m_nameToElementsMap, name); }
</del><ins>+ void appendToIdCache(const AtomicString& id, Element&);
+ void appendToNameCache(const AtomicString& name, Element&);
+ void didPopulate();
</ins><span class="cx">
</span><del>- void appendIdCache(const AtomicString& id, Element* element) { return append(m_idToElementsMap, id, element); }
- void appendNameCache(const AtomicString& name, Element* element) { return append(m_nameToElementsMap, name, element); }
</del><ins>+ size_t memoryCost() const;
</ins><span class="cx">
</span><del>- void didPopulate()
- {
-#ifndef ASSERT_DISABLED
- m_didPopulateCalled = true;
-#endif
- if (size_t cost = memoryCost())
- reportExtraMemoryCostForCollectionIndexCache(cost);
- }
- size_t memoryCost() const { return (m_idToElementsMap.size() + m_nameToElementsMap.size()) * sizeof(Element*); }
-
</del><span class="cx"> private:
</span><span class="cx"> typedef HashMap<AtomicStringImpl*, Vector<Element*>> StringToElementsMap;
</span><span class="cx">
</span><del>- const Vector<Element*>* find(const StringToElementsMap& map, const AtomicString& key) const
- {
-#ifndef ASSERT_DISABLED
- ASSERT(m_didPopulateCalled);
-#endif
- auto it = map.find(key.impl());
- return it != map.end() ? &it->value : nullptr;
- }
</del><ins>+ const Vector<Element*>* find(const StringToElementsMap&, const AtomicString& key) const;
+ static void append(StringToElementsMap&, const AtomicString& key, Element&);
</ins><span class="cx">
</span><del>- static void append(StringToElementsMap& map, const AtomicString& key, Element* element)
- {
- map.add(key.impl(), Vector<Element*>()).iterator->value.append(element);
- }
</del><ins>+ StringToElementsMap m_idMap;
+ StringToElementsMap m_nameMap;
</ins><span class="cx">
</span><del>- StringToElementsMap m_idToElementsMap;
- StringToElementsMap m_nameToElementsMap;
-#ifndef ASSERT_DISABLED
- bool m_didPopulateCalled;
</del><ins>+#if !ASSERT_DISABLED
+ bool m_didPopulate { false };
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -93,42 +65,32 @@
</span><span class="cx">
</span><span class="cx"> // DOM API
</span><span class="cx"> unsigned length() const;
</span><del>- Node* item(unsigned offset) const;
- virtual Node* namedItem(const AtomicString& name) const;
</del><ins>+ Element* item(unsigned offset) const;
+ virtual Element* namedItem(const AtomicString& name) const;
</ins><span class="cx"> PassRefPtr<NodeList> tags(const String&);
</span><span class="cx">
</span><span class="cx"> // Non-DOM API
</span><span class="cx"> bool hasNamedItem(const AtomicString& name) const;
</span><del>- void namedItems(const AtomicString& name, Vector<Ref<Element>>&) const;
- size_t memoryCost() const { return m_indexCache.memoryCost() + (m_namedElementCache ? m_namedElementCache->memoryCost() : 0); }
</del><ins>+ Vector<Ref<Element>> namedItems(const AtomicString& name) const;
+ size_t memoryCost() const;
</ins><span class="cx">
</span><del>- enum RootType {
- IsRootedAtNode,
- IsRootedAtDocument
- };
- bool isRootedAtDocument() const { return m_rootType == IsRootedAtDocument; }
- NodeListInvalidationType invalidationType() const { return static_cast<NodeListInvalidationType>(m_invalidationType); }
- CollectionType type() const { return static_cast<CollectionType>(m_collectionType); }
- ContainerNode& ownerNode() const { return const_cast<ContainerNode&>(m_ownerNode.get()); }
- void invalidateCache(const QualifiedName* attrName) const
- {
- if (!attrName || shouldInvalidateTypeOnAttributeChange(invalidationType(), *attrName))
- invalidateCache(document());
- else if (hasNamedElementCache() && (*attrName == HTMLNames::idAttr || *attrName == HTMLNames::nameAttr))
- invalidateNamedElementCache(document());
- }
</del><ins>+ bool isRootedAtDocument() const;
+ NodeListInvalidationType invalidationType() const;
+ CollectionType type() const;
+ ContainerNode& ownerNode() const;
+ void invalidateCache(const QualifiedName* attributeName) const;
</ins><span class="cx"> virtual void invalidateCache(Document&) const;
</span><span class="cx">
</span><del>- // For CollectionIndexCache
</del><ins>+ // For CollectionIndexCache; do not use elsewhere.
</ins><span class="cx"> Element* collectionBegin() const;
</span><span class="cx"> Element* collectionLast() const;
</span><del>- Element* collectionEnd() const { return nullptr; }
</del><ins>+ Element* collectionEnd() const;
</ins><span class="cx"> void collectionTraverseForward(Element*&, unsigned count, unsigned& traversedCount) const;
</span><span class="cx"> void collectionTraverseBackward(Element*&, unsigned count) const;
</span><del>- bool collectionCanTraverseBackward() const { return !m_usesCustomForwardOnlyTraversal; }
- void willValidateIndexCache() const { document().registerCollection(const_cast<HTMLCollection&>(*this)); }
</del><ins>+ bool collectionCanTraverseBackward() const;
+ void willValidateIndexCache() const;
</ins><span class="cx">
</span><del>- bool hasNamedElementCache() const { return !!m_namedElementCache; }
</del><ins>+ bool hasNamedElementCache() const;
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> enum ElementTraversalType { NormalTraversal, CustomForwardOnlyTraversal };
</span><span class="lines">@@ -136,34 +98,25 @@
</span><span class="cx">
</span><span class="cx"> virtual void updateNamedElementCache() const;
</span><span class="cx">
</span><del>- Document& document() const { return m_ownerNode->document(); }
</del><ins>+ void setNamedItemCache(std::unique_ptr<CollectionNamedElementCache>) const;
+ const CollectionNamedElementCache& namedItemCaches() const;
+
+private:
+ Document& document() const;
</ins><span class="cx"> ContainerNode& rootNode() const;
</span><del>- bool usesCustomForwardOnlyTraversal() const { return m_usesCustomForwardOnlyTraversal; }
</del><ins>+ bool usesCustomForwardOnlyTraversal() const;
</ins><span class="cx">
</span><del>- RootType rootType() const { return static_cast<RootType>(m_rootType); }
</del><ins>+ Element* iterateForPreviousElement(Element*) const;
+ Element* firstElement(ContainerNode& root) const;
+ Element* traverseForward(Element&, unsigned count, unsigned& traversedCount, ContainerNode& root) const;
</ins><span class="cx">
</span><del>- void setNameItemCache(std::unique_ptr<CollectionNamedElementCache> cache) const
- {
- ASSERT(!m_namedElementCache);
- m_namedElementCache = WTF::move(cache);
- document().collectionCachedIdNameMap(*this);
- }
</del><ins>+ virtual Element* customElementAfter(Element*) const;
</ins><span class="cx">
</span><del>- const CollectionNamedElementCache& namedItemCaches() const
- {
- ASSERT(!!m_namedElementCache);
- return *m_namedElementCache;
- }
</del><ins>+ void invalidateNamedElementCache(Document&) const;
</ins><span class="cx">
</span><del>-private:
- Element* iterateForPreviousElement(Element* current) const;
- Element* firstElement(ContainerNode& root) const;
- Element* traverseForward(Element& current, unsigned count, unsigned& traversedCount, ContainerNode& root) const;
</del><ins>+ enum RootType { IsRootedAtNode, IsRootedAtDocument };
+ static RootType rootTypeFromCollectionType(CollectionType);
</ins><span class="cx">
</span><del>- virtual Element* customElementAfter(Element*) const { ASSERT_NOT_REACHED(); return nullptr; }
-
- void invalidateNamedElementCache(Document&) const;
-
</del><span class="cx"> Ref<ContainerNode> m_ownerNode;
</span><span class="cx">
</span><span class="cx"> mutable CollectionIndexCache<HTMLCollection, Element*> m_indexCache;
</span><span class="lines">@@ -176,6 +129,125 @@
</span><span class="cx"> const unsigned m_usesCustomForwardOnlyTraversal : 1;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+inline const Vector<Element*>* CollectionNamedElementCache::findElementsWithId(const AtomicString& id) const
+{
+ return find(m_idMap, id);
+}
+
+inline const Vector<Element*>* CollectionNamedElementCache::findElementsWithName(const AtomicString& name) const
+{
+ return find(m_nameMap, name);
+}
+
+inline void CollectionNamedElementCache::appendToIdCache(const AtomicString& id, Element& element)
+{
+ return append(m_idMap, id, element);
+}
+
+inline void CollectionNamedElementCache::appendToNameCache(const AtomicString& name, Element& element)
+{
+ return append(m_nameMap, name, element);
+}
+
+inline size_t CollectionNamedElementCache::memoryCost() const
+{
+ return (m_idMap.size() + m_nameMap.size()) * sizeof(Element*);
+}
+
+inline void CollectionNamedElementCache::didPopulate()
+{
+#if !ASSERT_DISABLED
+ m_didPopulate = true;
+#endif
+ if (size_t cost = memoryCost())
+ reportExtraMemoryCostForCollectionIndexCache(cost);
+}
+
+inline const Vector<Element*>* CollectionNamedElementCache::find(const StringToElementsMap& map, const AtomicString& key) const
+{
+ ASSERT(m_didPopulate);
+ auto it = map.find(key.impl());
+ return it != map.end() ? &it->value : nullptr;
+}
+
+inline void CollectionNamedElementCache::append(StringToElementsMap& map, const AtomicString& key, Element& element)
+{
+ map.add(key.impl(), Vector<Element*>()).iterator->value.append(&element);
+}
+
+inline size_t HTMLCollection::memoryCost() const
+{
+ return m_indexCache.memoryCost() + (m_namedElementCache ? m_namedElementCache->memoryCost() : 0);
+}
+
+inline bool HTMLCollection::isRootedAtDocument() const
+{
+ return m_rootType == IsRootedAtDocument;
+}
+
+inline NodeListInvalidationType HTMLCollection::invalidationType() const
+{
+ return static_cast<NodeListInvalidationType>(m_invalidationType);
+}
+
+inline CollectionType HTMLCollection::type() const
+{
+ return static_cast<CollectionType>(m_collectionType);
+}
+
+inline ContainerNode& HTMLCollection::ownerNode() const
+{
+ return const_cast<ContainerNode&>(m_ownerNode.get());
+}
+
+inline Document& HTMLCollection::document() const
+{
+ return m_ownerNode->document();
+}
+
+inline void HTMLCollection::invalidateCache(const QualifiedName* attributeName) const
+{
+ if (!attributeName || shouldInvalidateTypeOnAttributeChange(invalidationType(), *attributeName))
+ invalidateCache(document());
+ else if (hasNamedElementCache() && (*attributeName == HTMLNames::idAttr || *attributeName == HTMLNames::nameAttr))
+ invalidateNamedElementCache(document());
+}
+
+inline Element* HTMLCollection::collectionEnd() const
+{
+ return nullptr;
+}
+
+inline bool HTMLCollection::collectionCanTraverseBackward() const
+{
+ return !m_usesCustomForwardOnlyTraversal;
+}
+
+inline void HTMLCollection::willValidateIndexCache() const
+{
+ document().registerCollection(const_cast<HTMLCollection&>(*this));
+}
+
+inline bool HTMLCollection::hasNamedElementCache() const
+{
+ return !!m_namedElementCache;
+}
+
+inline void HTMLCollection::setNamedItemCache(std::unique_ptr<CollectionNamedElementCache> cache) const
+{
+ ASSERT(cache);
+ ASSERT(!m_namedElementCache);
+ cache->didPopulate();
+ m_namedElementCache = WTF::move(cache);
+ document().collectionCachedIdNameMap(*this);
+}
+
+inline const CollectionNamedElementCache& HTMLCollection::namedItemCaches() const
+{
+ ASSERT(!!m_namedElementCache);
+ return *m_namedElementCache;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #define SPECIALIZE_TYPE_TRAITS_HTMLCOLLECTION(ClassName, Type) \
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlsCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlsCollection.cpp (175946 => 175947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlsCollection.cpp 2014-11-11 17:33:43 UTC (rev 175946)
+++ trunk/Source/WebCore/html/HTMLFormControlsCollection.cpp 2014-11-11 17:35:29 UTC (rev 175947)
</span><span class="lines">@@ -121,18 +121,17 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Node* HTMLFormControlsCollection::namedItem(const AtomicString& name) const
</del><ins>+HTMLElement* HTMLFormControlsCollection::namedItem(const AtomicString& name) const
</ins><span class="cx"> {
</span><span class="cx"> // http://msdn.microsoft.com/workshop/author/dhtml/reference/methods/nameditem.asp
</span><span class="cx"> // This method first searches for an object with a matching id
</span><span class="cx"> // attribute. If a match is not found, the method then searches for an
</span><span class="cx"> // object with a matching name attribute, but only on those elements
</span><span class="cx"> // that are allowed a name attribute.
</span><del>- const Vector<HTMLImageElement*>* imagesElements = is<HTMLFieldSetElement>(ownerNode()) ? nullptr : &formImageElements();
- if (HTMLElement* item = firstNamedItem(formControlElements(), imagesElements, idAttr, name))
</del><ins>+ auto* imageElements = is<HTMLFieldSetElement>(ownerNode()) ? nullptr : &formImageElements();
+ if (HTMLElement* item = firstNamedItem(formControlElements(), imageElements, idAttr, name))
</ins><span class="cx"> return item;
</span><del>-
- return firstNamedItem(formControlElements(), imagesElements, nameAttr, name);
</del><ins>+ return firstNamedItem(formControlElements(), imageElements, nameAttr, name);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLFormControlsCollection::updateNamedElementCache() const
</span><span class="lines">@@ -141,41 +140,41 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> auto cache = std::make_unique<CollectionNamedElementCache>();
</span><ins>+
+ bool ownerIsFormElement = is<HTMLFormElement>(ownerNode());
</ins><span class="cx"> HashSet<AtomicStringImpl*> foundInputElements;
</span><del>- const Vector<FormAssociatedElement*>& elementsArray = formControlElements();
</del><span class="cx">
</span><del>- for (unsigned i = 0; i < elementsArray.size(); ++i) {
- FormAssociatedElement& associatedElement = *elementsArray[i];
</del><ins>+ for (auto& elementPtr : formControlElements()) {
+ FormAssociatedElement& associatedElement = *elementPtr;
</ins><span class="cx"> if (associatedElement.isEnumeratable()) {
</span><span class="cx"> HTMLElement& element = associatedElement.asHTMLElement();
</span><del>- const AtomicString& idAttrVal = element.getIdAttribute();
- const AtomicString& nameAttrVal = element.getNameAttribute();
- if (!idAttrVal.isEmpty()) {
- cache->appendIdCache(idAttrVal, &element);
- foundInputElements.add(idAttrVal.impl());
</del><ins>+ const AtomicString& id = element.getIdAttribute();
+ if (!id.isEmpty()) {
+ cache->appendToIdCache(id, element);
+ if (ownerIsFormElement)
+ foundInputElements.add(id.impl());
</ins><span class="cx"> }
</span><del>- if (!nameAttrVal.isEmpty() && idAttrVal != nameAttrVal) {
- cache->appendNameCache(nameAttrVal, &element);
- foundInputElements.add(nameAttrVal.impl());
</del><ins>+ const AtomicString& name = element.getNameAttribute();
+ if (!name.isEmpty() && id != name) {
+ cache->appendToNameCache(name, element);
+ if (ownerIsFormElement)
+ foundInputElements.add(name.impl());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- if (is<HTMLFormElement>(ownerNode())) {
- const Vector<HTMLImageElement*>& imageElementsArray = formImageElements();
- for (unsigned i = 0; i < imageElementsArray.size(); ++i) {
- HTMLImageElement& element = *imageElementsArray[i];
- const AtomicString& idAttrVal = element.getIdAttribute();
- const AtomicString& nameAttrVal = element.getNameAttribute();
- if (!idAttrVal.isEmpty() && !foundInputElements.contains(idAttrVal.impl()))
- cache->appendIdCache(idAttrVal, &element);
- if (!nameAttrVal.isEmpty() && idAttrVal != nameAttrVal && !foundInputElements.contains(nameAttrVal.impl()))
- cache->appendNameCache(nameAttrVal, &element);
</del><ins>+ if (ownerIsFormElement) {
+ for (auto* elementPtr : formImageElements()) {
+ HTMLImageElement& element = *elementPtr;
+ const AtomicString& id = element.getIdAttribute();
+ if (!id.isEmpty() && !foundInputElements.contains(id.impl()))
+ cache->appendToIdCache(id, element);
+ const AtomicString& name = element.getNameAttribute();
+ if (!name.isEmpty() && id != name && !foundInputElements.contains(name.impl()))
+ cache->appendToNameCache(name, element);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- cache->didPopulate();
- setNameItemCache(WTF::move(cache));
</del><ins>+ setNamedItemCache(WTF::move(cache));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLFormControlsCollection::invalidateCache(Document& document) const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlsCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlsCollection.h (175946 => 175947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlsCollection.h 2014-11-11 17:33:43 UTC (rev 175946)
+++ trunk/Source/WebCore/html/HTMLFormControlsCollection.h 2014-11-11 17:35:29 UTC (rev 175947)
</span><span class="lines">@@ -24,13 +24,12 @@
</span><span class="cx"> #define HTMLFormControlsCollection_h
</span><span class="cx">
</span><span class="cx"> #include "HTMLCollection.h"
</span><ins>+#include "HTMLElement.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class FormAssociatedElement;
</span><del>-class HTMLElement;
</del><span class="cx"> class HTMLImageElement;
</span><del>-class QualifiedName;
</del><span class="cx">
</span><span class="cx"> // This class is just a big hack to find form elements even in malformed HTML elements.
</span><span class="cx"> // The famous <table><tr><form><td> problem.
</span><span class="lines">@@ -38,14 +37,12 @@
</span><span class="cx"> class HTMLFormControlsCollection final : public HTMLCollection {
</span><span class="cx"> public:
</span><span class="cx"> static PassRef<HTMLFormControlsCollection> create(ContainerNode&, CollectionType);
</span><del>-
</del><span class="cx"> virtual ~HTMLFormControlsCollection();
</span><span class="cx">
</span><del>- virtual Node* namedItem(const AtomicString& name) const override;
-
</del><span class="cx"> private:
</span><span class="cx"> explicit HTMLFormControlsCollection(ContainerNode&);
</span><span class="cx">
</span><ins>+ virtual HTMLElement* namedItem(const AtomicString& name) const override;
</ins><span class="cx"> virtual void invalidateCache(Document&) const override;
</span><span class="cx"> virtual void updateNamedElementCache() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormElement.cpp (175946 => 175947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormElement.cpp 2014-11-11 17:33:43 UTC (rev 175946)
+++ trunk/Source/WebCore/html/HTMLFormElement.cpp 2014-11-11 17:35:29 UTC (rev 175947)
</span><span class="lines">@@ -792,17 +792,19 @@
</span><span class="cx"> return elements()->hasNamedItem(name) || elementFromPastNamesMap(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME: Use RefPtr<HTMLElement> for namedItems. elements()->namedItems never return non-HTMLElement nodes.
-void HTMLFormElement::getNamedElements(const AtomicString& name, Vector<Ref<Element>>& namedItems)
</del><ins>+// FIXME: Use Ref<HTMLElement> for the function result since there are no non-HTML elements returned here.
+Vector<Ref<Element>> HTMLFormElement::namedElements(const AtomicString& name)
</ins><span class="cx"> {
</span><span class="cx"> // http://www.whatwg.org/specs/web-apps/current-work/multipage/forms.html#dom-form-nameditem
</span><del>- elements()->namedItems(name, namedItems);
</del><ins>+ Vector<Ref<Element>> namedItems = elements()->namedItems(name);
</ins><span class="cx">
</span><span class="cx"> HTMLElement* elementFromPast = elementFromPastNamesMap(name);
</span><span class="cx"> if (namedItems.size() == 1 && namedItems.first().ptr() != elementFromPast)
</span><span class="cx"> addToPastNamesMap(downcast<HTMLElement>(namedItems.first().get()).asFormNamedItem(), name);
</span><span class="cx"> else if (elementFromPast && namedItems.isEmpty())
</span><span class="cx"> namedItems.append(*elementFromPast);
</span><ins>+
+ return namedItems;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLFormElement::documentDidResumeFromPageCache()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormElement.h (175946 => 175947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormElement.h 2014-11-11 17:33:43 UTC (rev 175946)
+++ trunk/Source/WebCore/html/HTMLFormElement.h 2014-11-11 17:35:29 UTC (rev 175947)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<HTMLCollection> elements();
</span><span class="cx"> bool hasNamedElement(const AtomicString&);
</span><del>- void getNamedElements(const AtomicString&, Vector<Ref<Element>>&);
</del><ins>+ Vector<Ref<Element>> namedElements(const AtomicString&);
</ins><span class="cx">
</span><span class="cx"> unsigned length() const;
</span><span class="cx"> Node* item(unsigned index);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLNameCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLNameCollection.h (175946 => 175947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLNameCollection.h 2014-11-11 17:33:43 UTC (rev 175946)
+++ trunk/Source/WebCore/html/HTMLNameCollection.h 2014-11-11 17:35:29 UTC (rev 175947)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> #define HTMLNameCollection_h
</span><span class="cx">
</span><span class="cx"> #include "HTMLCollection.h"
</span><del>-
</del><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.cpp (175946 => 175947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.cpp 2014-11-11 17:33:43 UTC (rev 175946)
+++ trunk/Source/WebCore/html/HTMLSelectElement.cpp 2014-11-11 17:35:29 UTC (rev 175947)
</span><span class="lines">@@ -427,14 +427,14 @@
</span><span class="cx"> setIntegralAttribute(sizeAttr, size);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Node* HTMLSelectElement::namedItem(const AtomicString& name)
</del><ins>+HTMLOptionElement* HTMLSelectElement::namedItem(const AtomicString& name)
</ins><span class="cx"> {
</span><del>- return options()->namedItem(name);
</del><ins>+ return downcast<HTMLOptionElement>(options()->namedItem(name));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Node* HTMLSelectElement::item(unsigned index)
</del><ins>+HTMLOptionElement* HTMLSelectElement::item(unsigned index)
</ins><span class="cx"> {
</span><del>- return options()->item(index);
</del><ins>+ return downcast<HTMLOptionElement>(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></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.h (175946 => 175947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.h 2014-11-11 17:33:43 UTC (rev 175946)
+++ trunk/Source/WebCore/html/HTMLSelectElement.h 2014-11-11 17:35:29 UTC (rev 175947)
</span><span class="lines">@@ -28,12 +28,12 @@
</span><span class="cx">
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "HTMLFormControlElementWithState.h"
</span><ins>+#include "HTMLOptionElement.h"
</ins><span class="cx"> #include "TypeAhead.h"
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class HTMLOptionElement;
</del><span class="cx"> class HTMLOptionsCollection;
</span><span class="cx">
</span><span class="cx"> class HTMLSelectElement : public HTMLFormControlElementWithState, public TypeAheadDataSource {
</span><span class="lines">@@ -87,8 +87,8 @@
</span><span class="cx"> void setOption(unsigned index, HTMLOptionElement*, ExceptionCode&);
</span><span class="cx"> void setLength(unsigned, ExceptionCode&);
</span><span class="cx">
</span><del>- Node* namedItem(const AtomicString& name);
- Node* item(unsigned index);
</del><ins>+ HTMLOptionElement* namedItem(const AtomicString& name);
+ HTMLOptionElement* item(unsigned index);
</ins><span class="cx">
</span><span class="cx"> void scrollToSelection();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAxisScrollSnapOffsetscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp (175946 => 175947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp 2014-11-11 17:33:43 UTC (rev 175946)
+++ trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp 2014-11-11 17:35:29 UTC (rev 175947)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "AxisScrollSnapOffsets.h"
</span><span class="cx">
</span><ins>+#include "ElementChildIterator.h"
</ins><span class="cx"> #include "HTMLCollection.h"
</span><span class="cx"> #include "HTMLElement.h"
</span><span class="cx"> #include "RenderBox.h"
</span><span class="lines">@@ -38,16 +39,16 @@
</span><span class="cx">
</span><span class="cx"> static void appendChildSnapOffsets(HTMLElement& parent, bool shouldAddHorizontalChildOffsets, Vector<LayoutUnit>& horizontalSnapOffsetSubsequence, bool shouldAddVerticalChildOffsets, Vector<LayoutUnit>& verticalSnapOffsetSubsequence)
</span><span class="cx"> {
</span><del>- Element* child = parent.children()->collectionBegin();
</del><span class="cx"> // FIXME: Instead of traversing all children, register children with snap coordinates before appending to snapOffsetSubsequence.
</span><del>- while (child) {
- if (RenderBox* box = child->renderBox()) {
</del><ins>+ for (auto& child : childrenOfType<Element>(parent)) {
+ if (RenderBox* box = child.renderBox()) {
</ins><span class="cx"> LayoutUnit viewWidth = box->width();
</span><span class="cx"> LayoutUnit viewHeight = box->height();
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- // FIXME: Investigate why using localToContainerPoint gives the wrong offsets for iOS mainframe. Also, these offsets won't take transforms into account (make sure to test this!)
- float left = child->offsetLeft();
- float top = child->offsetTop();
</del><ins>+ // FIXME: Dangerous to call offsetLeft and offsetTop because they call updateLayoutIgnorePendingStylesheets, which can invalidate the RenderBox pointer we are holding.
+ // FIXME: Investigate why using localToContainerPoint gives the wrong offsets for iOS main frame. Also, these offsets won't take transforms into account (make sure to test this!).
+ float left = child.offsetLeft();
+ float top = child.offsetTop();
</ins><span class="cx"> #else
</span><span class="cx"> // FIXME: Check that localToContainerPoint works with CSS rotations.
</span><span class="cx"> FloatPoint position = box->localToContainerPoint(FloatPoint(), parent.renderBox());
</span><span class="lines">@@ -64,7 +65,6 @@
</span><span class="cx"> verticalSnapOffsetSubsequence.append(lastPotentialSnapPositionY);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- child = child->nextElementSibling();
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>