Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(516)

Side by Side Diff: Source/core/html/HTMLOptionsCollection.cpp

Issue 465483002: Merge NamedNodesCollection and StaticNodeList classes (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLAllCollection.cpp ('k') | Source/core/inspector/InspectorDOMAgent.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2011, 2012 Apple Computer, Inc. 2 * Copyright (C) 2006, 2011, 2012 Apple Computer, Inc.
3 * Copyright (C) 2014 Samsung Electronics. All rights reserved. 3 * Copyright (C) 2014 Samsung Electronics. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 * 19 *
20 */ 20 */
21 21
22 #include "config.h" 22 #include "config.h"
23 #include "core/html/HTMLOptionsCollection.h" 23 #include "core/html/HTMLOptionsCollection.h"
24 24
25 #include "bindings/core/v8/ExceptionMessages.h" 25 #include "bindings/core/v8/ExceptionMessages.h"
26 #include "bindings/core/v8/ExceptionState.h" 26 #include "bindings/core/v8/ExceptionState.h"
27 #include "core/dom/ExceptionCode.h" 27 #include "core/dom/ExceptionCode.h"
28 #include "core/dom/NamedNodesCollection.h" 28 #include "core/dom/StaticNodeList.h"
29 #include "core/html/HTMLOptionElement.h" 29 #include "core/html/HTMLOptionElement.h"
30 #include "core/html/HTMLSelectElement.h" 30 #include "core/html/HTMLSelectElement.h"
31 31
32 namespace blink { 32 namespace blink {
33 33
34 HTMLOptionsCollection::HTMLOptionsCollection(ContainerNode& select) 34 HTMLOptionsCollection::HTMLOptionsCollection(ContainerNode& select)
35 : HTMLCollection(select, SelectOptions, DoesNotOverrideItemAfter) 35 : HTMLCollection(select, SelectOptions, DoesNotOverrideItemAfter)
36 { 36 {
37 ASSERT(isHTMLSelectElement(select)); 37 ASSERT(isHTMLSelectElement(select));
38 ScriptWrappable::init(this); 38 ScriptWrappable::init(this);
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 return; 127 return;
128 128
129 if (namedItems.size() == 1) { 129 if (namedItems.size() == 1) {
130 returnValue1Enabled = true; 130 returnValue1Enabled = true;
131 returnValue1 = namedItems.at(0); 131 returnValue1 = namedItems.at(0);
132 return; 132 return;
133 } 133 }
134 134
135 // FIXME: The spec and Firefox do not return a NodeList. They always return the first matching Element. 135 // FIXME: The spec and Firefox do not return a NodeList. They always return the first matching Element.
136 returnValue0Enabled = true; 136 returnValue0Enabled = true;
137 returnValue0 = NamedNodesCollection::create(namedItems); 137 returnValue0 = StaticElementList::adopt(namedItems);
138 } 138 }
139 139
140 bool HTMLOptionsCollection::anonymousIndexedSetter(unsigned index, PassRefPtrWil lBeRawPtr<HTMLOptionElement> value, ExceptionState& exceptionState) 140 bool HTMLOptionsCollection::anonymousIndexedSetter(unsigned index, PassRefPtrWil lBeRawPtr<HTMLOptionElement> value, ExceptionState& exceptionState)
141 { 141 {
142 HTMLSelectElement& base = toHTMLSelectElement(ownerNode()); 142 HTMLSelectElement& base = toHTMLSelectElement(ownerNode());
143 if (!value) { // undefined or null 143 if (!value) { // undefined or null
144 base.remove(index); 144 base.remove(index);
145 return true; 145 return true;
146 } 146 }
147 base.setOption(index, value.get(), exceptionState); 147 base.setOption(index, value.get(), exceptionState);
148 return true; 148 return true;
149 } 149 }
150 150
151 } //namespace 151 } //namespace
152 152
OLDNEW
« no previous file with comments | « Source/core/html/HTMLAllCollection.cpp ('k') | Source/core/inspector/InspectorDOMAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698