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

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

Issue 180143003: Have LiveNodeListBase::ownerNode() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 10 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/HTMLNameCollection.cpp ('k') | Source/core/html/HTMLOptionsCollection.idl » ('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,
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 if (!newOption) { 81 if (!newOption) {
82 exceptionState.throwTypeError("The element provided was not an HTMLOptio nElement."); 82 exceptionState.throwTypeError("The element provided was not an HTMLOptio nElement.");
83 return; 83 return;
84 } 84 }
85 85
86 if (index < -1) { 86 if (index < -1) {
87 exceptionState.throwDOMException(IndexSizeError, "The index provided (" + String::number(index) + ") is less than -1."); 87 exceptionState.throwDOMException(IndexSizeError, "The index provided (" + String::number(index) + ") is less than -1.");
88 return; 88 return;
89 } 89 }
90 90
91 HTMLSelectElement* select = toHTMLSelectElement(ownerNode()); 91 HTMLSelectElement& select = toHTMLSelectElement(ownerNode());
92 92
93 if (index == -1 || unsigned(index) >= length()) 93 if (index == -1 || unsigned(index) >= length())
94 select->add(newOption, 0, exceptionState); 94 select.add(newOption, 0, exceptionState);
95 else 95 else
96 select->add(newOption, toHTMLOptionElement(item(index)), exceptionState) ; 96 select.add(newOption, toHTMLOptionElement(item(index)), exceptionState);
97 97
98 ASSERT(!exceptionState.hadException()); 98 ASSERT(!exceptionState.hadException());
99 } 99 }
100 100
101 void HTMLOptionsCollection::remove(int index) 101 void HTMLOptionsCollection::remove(int index)
102 { 102 {
103 toHTMLSelectElement(ownerNode())->remove(index); 103 toHTMLSelectElement(ownerNode()).remove(index);
104 } 104 }
105 105
106 void HTMLOptionsCollection::remove(HTMLOptionElement* option) 106 void HTMLOptionsCollection::remove(HTMLOptionElement* option)
107 { 107 {
108 return remove(option->index()); 108 return remove(option->index());
109 } 109 }
110 110
111 int HTMLOptionsCollection::selectedIndex() const 111 int HTMLOptionsCollection::selectedIndex() const
112 { 112 {
113 return toHTMLSelectElement(ownerNode())->selectedIndex(); 113 return toHTMLSelectElement(ownerNode()).selectedIndex();
114 } 114 }
115 115
116 void HTMLOptionsCollection::setSelectedIndex(int index) 116 void HTMLOptionsCollection::setSelectedIndex(int index)
117 { 117 {
118 toHTMLSelectElement(ownerNode())->setSelectedIndex(index); 118 toHTMLSelectElement(ownerNode()).setSelectedIndex(index);
119 } 119 }
120 120
121 void HTMLOptionsCollection::setLength(unsigned length, ExceptionState& exception State) 121 void HTMLOptionsCollection::setLength(unsigned length, ExceptionState& exception State)
122 { 122 {
123 toHTMLSelectElement(ownerNode())->setLength(length, exceptionState); 123 toHTMLSelectElement(ownerNode()).setLength(length, exceptionState);
124 } 124 }
125 125
126 void HTMLOptionsCollection::namedGetter(const AtomicString& name, bool& returnVa lue0Enabled, RefPtr<NodeList>& returnValue0, bool& returnValue1Enabled, RefPtr<E lement>& returnValue1) 126 void HTMLOptionsCollection::namedGetter(const AtomicString& name, bool& returnVa lue0Enabled, RefPtr<NodeList>& returnValue0, bool& returnValue1Enabled, RefPtr<E lement>& returnValue1)
127 { 127 {
128 Vector<RefPtr<Element> > namedItems; 128 Vector<RefPtr<Element> > namedItems;
129 this->namedItems(name, namedItems); 129 this->namedItems(name, namedItems);
130 130
131 if (!namedItems.size()) 131 if (!namedItems.size())
132 return; 132 return;
133 133
134 if (namedItems.size() == 1) { 134 if (namedItems.size() == 1) {
135 returnValue1Enabled = true; 135 returnValue1Enabled = true;
136 returnValue1 = namedItems.at(0); 136 returnValue1 = namedItems.at(0);
137 return; 137 return;
138 } 138 }
139 139
140 // FIXME: The spec and Firefox do not return a NodeList. They always return the first matching Element. 140 // FIXME: The spec and Firefox do not return a NodeList. They always return the first matching Element.
141 returnValue0Enabled = true; 141 returnValue0Enabled = true;
142 returnValue0 = NamedNodesCollection::create(namedItems); 142 returnValue0 = NamedNodesCollection::create(namedItems);
143 } 143 }
144 144
145 bool HTMLOptionsCollection::anonymousIndexedSetter(unsigned index, PassRefPtr<HT MLOptionElement> value, ExceptionState& exceptionState) 145 bool HTMLOptionsCollection::anonymousIndexedSetter(unsigned index, PassRefPtr<HT MLOptionElement> value, ExceptionState& exceptionState)
146 { 146 {
147 HTMLSelectElement* base = toHTMLSelectElement(ownerNode()); 147 HTMLSelectElement& base = toHTMLSelectElement(ownerNode());
148 if (!value) { // undefined or null 148 if (!value) { // undefined or null
149 base->remove(index); 149 base.remove(index);
150 return true; 150 return true;
151 } 151 }
152 base->setOption(index, value.get(), exceptionState); 152 base.setOption(index, value.get(), exceptionState);
153 return true; 153 return true;
154 } 154 }
155 155
156 } //namespace 156 } //namespace
157 157
OLDNEW
« no previous file with comments | « Source/core/html/HTMLNameCollection.cpp ('k') | Source/core/html/HTMLOptionsCollection.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698