Chromium Code Reviews| Index: Source/core/html/RadioNodeList.cpp |
| diff --git a/Source/core/html/RadioNodeList.cpp b/Source/core/html/RadioNodeList.cpp |
| index 9e0b10b8598fb2ab7367779168b270c9d61ddbf8..7caf143362cd602d82b584ec6e8ca65628e86549 100644 |
| --- a/Source/core/html/RadioNodeList.cpp |
| +++ b/Source/core/html/RadioNodeList.cpp |
| @@ -49,12 +49,12 @@ RadioNodeList::~RadioNodeList() |
| ownerNode()->nodeLists()->removeCacheWithAtomicName(this, RadioNodeListType, m_name); |
| } |
| -static inline HTMLInputElement* toRadioButtonInputElement(Node* node) |
| +static inline Result<HTMLInputElement> toRadioButtonInputElement(Node* node) |
| { |
| ASSERT(node->isElementNode()); |
| - HTMLInputElement* inputElement = node->toInputElement(); |
| + Handle<HTMLInputElement> inputElement = node->toInputElement(); |
| if (!inputElement || !inputElement->isRadioButton() || inputElement->value().isEmpty()) |
| - return 0; |
| + return nullptr; |
| return inputElement; |
| } |
| @@ -62,7 +62,7 @@ String RadioNodeList::value() const |
| { |
| for (unsigned i = 0; i < length(); ++i) { |
| Node* node = item(i); |
| - const HTMLInputElement* inputElement = toRadioButtonInputElement(node); |
| + Handle<const HTMLInputElement> inputElement = toRadioButtonInputElement(node); |
|
Vyacheslav Egorov (Google)
2013/07/18 16:50:08
HandleScope?
haraken
2013/07/19 02:57:09
Done.
|
| if (!inputElement || !inputElement->checked()) |
| continue; |
| return inputElement->value(); |
| @@ -74,7 +74,7 @@ void RadioNodeList::setValue(const String& value) |
| { |
| for (unsigned i = 0; i < length(); ++i) { |
| Node* node = item(i); |
| - HTMLInputElement* inputElement = toRadioButtonInputElement(node); |
| + Handle<HTMLInputElement> inputElement = toRadioButtonInputElement(node); |
|
Vyacheslav Egorov (Google)
2013/07/18 16:50:08
HandleScope? (ditto in other loops).
haraken
2013/07/19 02:57:09
Done.
|
| if (!inputElement || inputElement->value() != value) |
| continue; |
| inputElement->setChecked(true); |
| @@ -103,7 +103,7 @@ bool RadioNodeList::nodeMatches(Element* testElement) const |
| if (!testElement->hasTagName(objectTag) && !testElement->isFormControlElement()) |
| return false; |
| - if (HTMLInputElement* inputElement = testElement->toInputElement()) { |
| + if (Handle<HTMLInputElement> inputElement = testElement->toInputElement()) { |
| if (inputElement->isImageButton()) |
| return false; |
| } |