Index: Source/core/html/HTMLOptionElement.cpp |
diff --git a/Source/core/html/HTMLOptionElement.cpp b/Source/core/html/HTMLOptionElement.cpp |
index 957ae9216db6229e7f507df06431369f351d0a06..091cb8100a08144be2654b2bd38d8bc72f5d3fe5 100644 |
--- a/Source/core/html/HTMLOptionElement.cpp |
+++ b/Source/core/html/HTMLOptionElement.cpp |
@@ -145,7 +145,7 @@ void HTMLOptionElement::setText(const String &text, ExceptionCode& ec) |
// Changing the text causes a recalc of a select's items, which will reset the selected |
// index to the first item if the select is single selection with a menu list. We attempt to |
// preserve the selected item. |
- RefPtr<HTMLSelectElement> select = ownerSelectElement(); |
+ Handle<HTMLSelectElement> select = ownerSelectElement(); |
bool selectIsMenuList = select && select->usesMenuList(); |
int oldSelectedIndex = selectIsMenuList ? select->selectedIndex() : -1; |
@@ -164,7 +164,7 @@ void HTMLOptionElement::setText(const String &text, ExceptionCode& ec) |
void HTMLOptionElement::accessKeyAction(bool) |
{ |
- HTMLSelectElement* select = ownerSelectElement(); |
+ Handle<HTMLSelectElement> select = ownerSelectElement(); |
if (select) |
select->accessKeySetSelectedIndex(index()); |
} |
@@ -173,7 +173,7 @@ int HTMLOptionElement::index() const |
{ |
// It would be faster to cache the index, but harder to get it right in all cases. |
- HTMLSelectElement* selectElement = ownerSelectElement(); |
+ Handle<HTMLSelectElement> selectElement = ownerSelectElement(); |
if (!selectElement) |
return 0; |
@@ -235,7 +235,7 @@ void HTMLOptionElement::setValue(const String& value) |
bool HTMLOptionElement::selected() |
{ |
- if (HTMLSelectElement* select = ownerSelectElement()) |
+ if (Handle<HTMLSelectElement> select = ownerSelectElement()) |
select->updateListItemSelectedStates(); |
return m_isSelected; |
} |
@@ -247,7 +247,7 @@ void HTMLOptionElement::setSelected(bool selected) |
setSelectedState(selected); |
- if (HTMLSelectElement* select = ownerSelectElement()) |
+ if (Handle<HTMLSelectElement> select = ownerSelectElement()) |
select->optionSelectionStateChanged(this, selected); |
} |
@@ -259,7 +259,7 @@ void HTMLOptionElement::setSelectedState(bool selected) |
m_isSelected = selected; |
didAffectSelector(AffectedSelectorChecked); |
- if (HTMLSelectElement* select = ownerSelectElement()) |
+ if (Handle<HTMLSelectElement> select = ownerSelectElement()) |
select->invalidateSelectedItems(); |
} |
@@ -270,7 +270,7 @@ void HTMLOptionElement::childrenChanged(bool changedByParser, Node* beforeChange |
dataList->optionElementChildrenChanged(); |
else |
#endif |
- if (HTMLSelectElement* select = ownerSelectElement()) |
+ if (Handle<HTMLSelectElement> select = ownerSelectElement()) |
select->optionElementChildrenChanged(); |
HTMLElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta); |
} |
@@ -286,14 +286,14 @@ HTMLDataListElement* HTMLOptionElement::ownerDataListElement() const |
} |
#endif |
-HTMLSelectElement* HTMLOptionElement::ownerSelectElement() const |
+Result<HTMLSelectElement> HTMLOptionElement::ownerSelectElement() const |
{ |
ContainerNode* select = parentNode(); |
while (select && !select->hasTagName(selectTag)) |
select = select->parentNode(); |
if (!select) |
- return 0; |
+ return nullptr; |
return toHTMLSelectElement(select); |
} |
@@ -333,7 +333,7 @@ void HTMLOptionElement::didRecalcStyle(StyleChange) |
{ |
// FIXME: This is nasty, we ask our owner select to repaint even if the new |
// style is exactly the same. |
- if (HTMLSelectElement* select = ownerSelectElement()) { |
+ if (Handle<HTMLSelectElement> select = ownerSelectElement()) { |
if (RenderObject* renderer = select->renderer()) |
renderer->repaint(); |
} |
@@ -361,7 +361,7 @@ bool HTMLOptionElement::isDisabledFormControl() const |
Node::InsertionNotificationRequest HTMLOptionElement::insertedInto(ContainerNode* insertionPoint) |
{ |
- if (HTMLSelectElement* select = ownerSelectElement()) { |
+ if (Handle<HTMLSelectElement> select = ownerSelectElement()) { |
select->setRecalcListItems(); |
// Do not call selected() since calling updateListItemSelectedStates() |
// at this time won't do the right thing. (Why, exactly?) |