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

Unified Diff: Source/core/accessibility/AccessibilityListBoxOption.cpp

Issue 19510005: [oilpan] Completely move HTMLFormControlElement's hierarchy to the managed heap Base URL: svn://svn.chromium.org/blink/branches/oilpan
Patch Set: Created 7 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/accessibility/AccessibilityListBoxOption.cpp
diff --git a/Source/core/accessibility/AccessibilityListBoxOption.cpp b/Source/core/accessibility/AccessibilityListBoxOption.cpp
index dd3dbe98f9fb67857c66605887c8521da3b740a6..1df83d0359569a7fe06f009ff28683b9c14fb745 100644
--- a/Source/core/accessibility/AccessibilityListBoxOption.cpp
+++ b/Source/core/accessibility/AccessibilityListBoxOption.cpp
@@ -85,7 +85,7 @@ bool AccessibilityListBoxOption::isSelected() const
bool AccessibilityListBoxOption::isSelectedOptionActive() const
{
- HTMLSelectElement* listBoxParentNode = listBoxOptionParentNode();
+ Handle<HTMLSelectElement> listBoxParentNode = listBoxOptionParentNode();
if (!listBoxParentNode)
return false;
@@ -98,7 +98,7 @@ LayoutRect AccessibilityListBoxOption::elementRect() const
if (!m_optionElement)
return rect;
- HTMLSelectElement* listBoxParentNode = listBoxOptionParentNode();
+ Handle<HTMLSelectElement> listBoxParentNode = listBoxOptionParentNode();
if (!listBoxParentNode)
return rect;
@@ -136,7 +136,7 @@ bool AccessibilityListBoxOption::canSetSelectedAttribute() const
if (m_optionElement->isDisabledFormControl())
return false;
- HTMLSelectElement* selectElement = listBoxOptionParentNode();
+ Handle<HTMLSelectElement> selectElement = listBoxOptionParentNode();
if (selectElement && selectElement->isDisabledFormControl())
return false;
@@ -168,16 +168,16 @@ Element* AccessibilityListBoxOption::actionElement() const
AccessibilityObject* AccessibilityListBoxOption::parentObject() const
{
- HTMLSelectElement* parentNode = listBoxOptionParentNode();
+ Handle<HTMLSelectElement> parentNode = listBoxOptionParentNode();
if (!parentNode)
return 0;
- return m_optionElement->document()->axObjectCache()->getOrCreate(parentNode);
+ return m_optionElement->document()->axObjectCache()->getOrCreate(parentNode.raw());
}
void AccessibilityListBoxOption::setSelected(bool selected)
{
- HTMLSelectElement* selectElement = listBoxOptionParentNode();
+ Handle<HTMLSelectElement> selectElement = listBoxOptionParentNode();
if (!selectElement)
return;
@@ -193,10 +193,10 @@ void AccessibilityListBoxOption::setSelected(bool selected)
selectElement->accessKeySetSelectedIndex(optionIndex);
}
-HTMLSelectElement* AccessibilityListBoxOption::listBoxOptionParentNode() const
+Result<HTMLSelectElement> AccessibilityListBoxOption::listBoxOptionParentNode() const
{
if (!m_optionElement)
- return 0;
+ return nullptr;
if (m_optionElement->hasTagName(optionTag))
return static_cast<HTMLOptionElement*>(m_optionElement)->ownerSelectElement();
@@ -204,7 +204,7 @@ HTMLSelectElement* AccessibilityListBoxOption::listBoxOptionParentNode() const
if (m_optionElement->hasTagName(optgroupTag))
return static_cast<HTMLOptGroupElement*>(m_optionElement)->ownerSelectElement();
- return 0;
+ return nullptr;
}
int AccessibilityListBoxOption::listBoxOptionIndex() const
@@ -212,7 +212,7 @@ int AccessibilityListBoxOption::listBoxOptionIndex() const
if (!m_optionElement)
return -1;
- HTMLSelectElement* selectElement = listBoxOptionParentNode();
+ Handle<HTMLSelectElement> selectElement = listBoxOptionParentNode();
if (!selectElement)
return -1;
« no previous file with comments | « Source/core/accessibility/AccessibilityListBoxOption.h ('k') | Source/core/accessibility/AccessibilityNodeObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698